Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

13 files changed, 164 insertions, 197 deletions

diff --git a/Tools/QtTestBrowser/CMakeLists.txt b/Tools/QtTestBrowser/CMakeLists.txt
new file mode 100644
index 000000000..1ee49365a
--- /dev/null
+++ b/Tools/QtTestBrowser/CMakeLists.txt
@@ -0,0 +1,68 @@
+set(QtTestBrowser_INCLUDE_DIRECTORIES
+    "${CMAKE_BINARY_DIR}"
+    "${CMAKE_SOURCE_DIR}/Source"
+    "${DERIVED_SOURCES_WEBKIT_DIR}"
+    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
+    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/QtWebKit"
+    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/QtWebKitWidgets"
+    "${JAVASCRIPTCORE_DIR}"
+    "${JAVASCRIPTCORE_DIR}/runtime"
+    "${WEBCORE_DIR}"
+    "${WEBCORE_DIR}/platform"
+    "${WEBCORE_DIR}/platform/qt"
+    "${WEBKIT_DIR}/qt/Api"
+    "${WEBKIT_DIR}/qt/WebCoreSupport"
+    "${WEBKIT_DIR}/qt/WidgetApi"
+    "${WTF_DIR}"
+)
+
+set(QtTestBrowser_SOURCES
+    cookiejar.cpp
+    fpstimer.cpp
+    launcherwindow.cpp
+    locationedit.cpp
+    mainwindow.cpp
+    qttestbrowser.cpp
+    urlloader.cpp
+    utils.cpp
+    webpage.cpp
+    webview.cpp
+)
+
+set(QtTestBrowser_SYSTEM_INCLUDE_DIRECTORIES
+    ${Qt5Gui_INCLUDE_DIRS}
+    ${Qt5Network_INCLUDE_DIRS}
+    ${Qt5Widgets_INCLUDE_DIRS}
+)
+
+set(QtTestBrowser_LIBRARIES
+    ${Qt5Gui_LIBRARIES}
+    ${Qt5Network_LIBRARIES}
+    ${Qt5Widgets_LIBRARIES}
+    ${Qt5PrintSupport_LIBRARIES}
+    WebKitWidgets
+)
+
+qt_wrap_cpp(WebKit QtTestBrowser_SOURCES
+    webinspector.h
+)
+
+if (Qt5OpenGL_FOUND)
+    list(APPEND QtTestBrowser_SYSTEM_INCLUDE_DIRECTORIES
+        ${Qt5OpenGL_INCLUDE_DIRS}
+    )
+    list(APPEND QtTestBrowser_LIBRARIES
+        ${Qt5OpenGL_LIBRARIES}
+    )
+    add_definitions(-DQT_CONFIGURED_WITH_OPENGL)
+endif ()
+
+if (ENABLE_TEST_SUPPORT)
+    add_definitions(-DHAVE_QTTESTSUPPORT)
+endif ()
+
+include_directories(${QtTestBrowser_INCLUDE_DIRECTORIES})
+include_directories(SYSTEM ${QtTestBrowser_SYSTEM_INCLUDE_DIRECTORIES})
+add_executable(QtTestBrowser ${QtTestBrowser_SOURCES})
+target_link_libraries(QtTestBrowser ${QtTestBrowser_LIBRARIES})
+set_target_properties(QtTestBrowser PROPERTIES FOLDER "Tools")
diff --git a/Tools/QtTestBrowser/QtTestBrowser.pro b/Tools/QtTestBrowser/QtTestBrowser.pro
deleted file mode 100644
index 366d0bd5a..000000000
--- a/Tools/QtTestBrowser/QtTestBrowser.pro
+++ /dev/null
@@ -1,57 +0,0 @@
-# -------------------------------------------------------------------
-# Project file for the QtTestBrowser binary
-#
-# See 'Tools/qmake/README' for an overview of the build system
-# -------------------------------------------------------------------
-
-TEMPLATE = app
-
-INCLUDEPATH += \
-    $${ROOT_WEBKIT_DIR}/Source/WebCore/platform/qt \
-    $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/WebCoreSupport \
-    $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/ \
-    $${ROOT_WEBKIT_DIR}/Source/WTF
-
-SOURCES += \
-    locationedit.cpp \
-    launcherwindow.cpp \
-    qttestbrowser.cpp \
-    mainwindow.cpp \
-    urlloader.cpp \
-    utils.cpp \
-    webpage.cpp \
-    webview.cpp \
-    fpstimer.cpp \
-    cookiejar.cpp
-
-HEADERS += \
-    locationedit.h \
-    launcherwindow.h \
-    mainwindow.h \
-    urlloader.h \
-    utils.h \
-    webinspector.h \
-    webpage.h \
-    webview.h \
-    fpstimer.h \
-    cookiejar.h
-
-
-WEBKIT += wtf webcore
-
-DESTDIR = $$ROOT_BUILD_DIR/bin
-
-QT += network webkitwidgets widgets
-have?(QTPRINTSUPPORT): QT += printsupport
-
-macx:QT += xml
-
-have?(FONTCONFIG): PKGCONFIG += fontconfig
-
-qtHaveModule(opengl) {
-    QT += opengl
-    DEFINES += QT_CONFIGURED_WITH_OPENGL
-}
-
-RESOURCES += \
-    QtTestBrowser.qrc
diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp
index 0cb0ab2ce..84a4c0873 100644
--- a/Tools/QtTestBrowser/launcherwindow.cpp
+++ b/Tools/QtTestBrowser/launcherwindow.cpp
@@ -95,12 +95,6 @@ LauncherWindow::LauncherWindow(WindowOptions* data, QGraphicsScene* sharedScene)
     , m_inspector(0)
     , m_formatMenuAction(0)
     , m_zoomAnimation(0)
-#if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
-    , m_reply(0)
-#endif
-#ifndef QT_NO_LINEEDIT
-    , m_findFlag(0)
-#endif
 {
     if (data)
         m_windowOptions = *data;
@@ -175,10 +169,7 @@ void LauncherWindow::initializeView()
         WebViewGraphicsBased* view = new WebViewGraphicsBased(splitter);
         m_view = view;
 #ifndef QT_NO_OPENGL
-        if (!m_windowOptions.useQOpenGLWidgetViewport)
-            toggleQGLWidgetViewport(m_windowOptions.useQGLWidgetViewport);
-        if (!m_windowOptions.useQGLWidgetViewport)
-            toggleQOpenGLWidgetViewport(m_windowOptions.useQOpenGLWidgetViewport);
+        toggleQGLWidgetViewport(m_windowOptions.useQGLWidgetViewport);
 #endif
         view->setPage(page());
 
@@ -221,11 +212,14 @@ void LauncherWindow::initializeView()
 void LauncherWindow::applyPrefs()
 {
     QWebSettings* settings = page()->settings();
-    settings->setAttribute(QWebSettings::AcceleratedCompositingEnabled, m_windowOptions.useCompositing);
+#ifndef QT_NO_OPENGL
+    settings->setAttribute(QWebSettings::AcceleratedCompositingEnabled, m_windowOptions.useCompositing && m_windowOptions.useQGLWidgetViewport);
+#endif
     settings->setAttribute(QWebSettings::TiledBackingStoreEnabled, m_windowOptions.useTiledBackingStore);
     settings->setAttribute(QWebSettings::FrameFlatteningEnabled, m_windowOptions.useFrameFlattening);
     settings->setAttribute(QWebSettings::WebGLEnabled, m_windowOptions.useWebGL);
     m_windowOptions.useWebAudio = settings->testAttribute(QWebSettings::WebAudioEnabled);
+    m_windowOptions.useMediaSource = settings->testAttribute(QWebSettings::MediaSourceEnabled);
 
     if (!isGraphicsBased())
         return;
@@ -263,6 +257,8 @@ void LauncherWindow::createChrome()
     editMenu->addAction(page()->action(QWebPage::Copy));
     editMenu->addAction(page()->action(QWebPage::Paste));
     editMenu->addSeparator();
+    editMenu->addAction(page()->action(QWebPage::SelectAll));
+    editMenu->addSeparator();
 #ifndef QT_NO_LINEEDIT
     editMenu->addAction("&Find", this, SLOT(showFindBar()), QKeySequence(Qt::CTRL | Qt::Key_F));
     editMenu->addSeparator();
@@ -333,6 +329,13 @@ void LauncherWindow::createChrome()
     toggleWebAudio->setEnabled(false);
 #endif
 
+    QAction* toggleMediaSource = toolsMenu->addAction("Toggle MediaSource", this, SLOT(toggleMediaSource(bool)));
+    toggleMediaSource->setCheckable(true);
+    toggleWebGL->setChecked(settings->testAttribute(QWebSettings::MediaSourceEnabled));
+#if !ENABLE(MEDIA_SOURCE)
+    toggleMediaSource->setEnabled(false);
+#endif
+
     QAction* spatialNavigationAction = toolsMenu->addAction("Toggle Spatial Navigation", this, SLOT(toggleSpatialNavigation(bool)));
     spatialNavigationAction->setCheckable(true);
     spatialNavigationAction->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_S));
@@ -382,12 +385,8 @@ void LauncherWindow::createChrome()
     QAction* toggleAcceleratedCompositing = graphicsViewMenu->addAction("Toggle Accelerated Compositing", this, SLOT(toggleAcceleratedCompositing(bool)));
     toggleAcceleratedCompositing->setCheckable(true);
     toggleAcceleratedCompositing->setChecked(settings->testAttribute(QWebSettings::AcceleratedCompositingEnabled));
-
-    QAction* toggleAccelerated2dCanvas = graphicsViewMenu->addAction("Toggle Accelerated 2D canvas", this, SLOT(toggleAccelerated2dCanvas(bool)));
-    toggleAccelerated2dCanvas->setCheckable(true);
-    toggleAccelerated2dCanvas->setEnabled(settings->testAttribute(QWebSettings::AcceleratedCompositingEnabled));
-    toggleAccelerated2dCanvas->setChecked(settings->testAttribute(QWebSettings::Accelerated2dCanvasEnabled));
-    toggleAccelerated2dCanvas->connect(toggleAcceleratedCompositing, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
+    toggleAcceleratedCompositing->setEnabled(isGraphicsBased());
+    toggleAcceleratedCompositing->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
 
     QAction* toggleResizesToContents = graphicsViewMenu->addAction("Toggle Resizes To Contents Mode", this, SLOT(toggleResizesToContents(bool)));
     toggleResizesToContents->setCheckable(true);
@@ -407,13 +406,6 @@ void LauncherWindow::createChrome()
     toggleQGLWidgetViewport->setChecked(m_windowOptions.useQGLWidgetViewport);
     toggleQGLWidgetViewport->setEnabled(isGraphicsBased());
     toggleQGLWidgetViewport->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-    QAction* toggleQOpenGLWidgetViewport = graphicsViewMenu->addAction("Toggle use of QOpenGLWidget Viewport", this, SLOT(toggleQOpenGLWidgetViewport(bool)));
-    toggleQOpenGLWidgetViewport->setCheckable(true);
-    toggleQOpenGLWidgetViewport->setChecked(m_windowOptions.useQOpenGLWidgetViewport);
-    toggleQOpenGLWidgetViewport->setEnabled(isGraphicsBased());
-    toggleQOpenGLWidgetViewport->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
-#endif
 #endif
 
     QMenu* viewportUpdateMenu = graphicsViewMenu->addMenu("Change Viewport Update Mode");
@@ -800,10 +792,7 @@ void LauncherWindow::screenshot()
 #endif
 
 #ifndef QT_NO_OPENGL
-    if (!m_windowOptions.useQOpenGLWidgetViewport)
-        toggleQGLWidgetViewport(m_windowOptions.useQGLWidgetViewport);
-    if (!m_windowOptions.useQGLWidgetViewport)
-        toggleQOpenGLWidgetViewport(m_windowOptions.useQOpenGLWidgetViewport);
+    toggleQGLWidgetViewport(m_windowOptions.useQGLWidgetViewport);
 #endif
 }
 
@@ -894,11 +883,6 @@ void LauncherWindow::toggleAcceleratedCompositing(bool toggle)
     page()->settings()->setAttribute(QWebSettings::AcceleratedCompositingEnabled, toggle);
 }
 
-void LauncherWindow::toggleAccelerated2dCanvas(bool toggle)
-{
-    page()->settings()->setAttribute(QWebSettings::Accelerated2dCanvasEnabled, toggle);
-}
-
 void LauncherWindow::toggleTiledBackingStore(bool toggle)
 {
     page()->settings()->setAttribute(QWebSettings::TiledBackingStoreEnabled, toggle);
@@ -922,6 +906,12 @@ void LauncherWindow::toggleWebAudio(bool toggle)
     page()->settings()->setAttribute(QWebSettings::WebAudioEnabled, toggle);
 }
 
+void LauncherWindow::toggleMediaSource(bool toggle)
+{
+    m_windowOptions.useMediaSource = toggle;
+    page()->settings()->setAttribute(QWebSettings::MediaSourceEnabled, toggle);
+}
+
 void LauncherWindow::animatedFlip()
 {
     qobject_cast<WebViewGraphicsBased*>(m_view)->animatedFlip();
@@ -931,9 +921,10 @@ void LauncherWindow::animatedYFlip()
 {
     qobject_cast<WebViewGraphicsBased*>(m_view)->animatedYFlip();
 }
-void LauncherWindow::toggleSpatialNavigation(bool b)
+
+void LauncherWindow::toggleSpatialNavigation(bool enable)
 {
-    page()->settings()->setAttribute(QWebSettings::SpatialNavigationEnabled, b);
+    page()->settings()->setAttribute(QWebSettings::SpatialNavigationEnabled, enable);
 }
 
 void LauncherWindow::toggleFullScreenMode(bool enable)
@@ -990,27 +981,10 @@ void LauncherWindow::toggleQGLWidgetViewport(bool enable)
     if (!isGraphicsBased())
         return;
 
-    if (enable)
-        m_windowOptions.useQOpenGLWidgetViewport = false;
     m_windowOptions.useQGLWidgetViewport = enable;
-
     WebViewGraphicsBased* view = static_cast<WebViewGraphicsBased*>(m_view);
-    view->setViewport(enable ? new QGLWidget() : 0);
-}
 
-void LauncherWindow::toggleQOpenGLWidgetViewport(bool enable)
-{
-    if (!isGraphicsBased())
-        return;
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-    if (enable)
-        m_windowOptions.useQGLWidgetViewport = false;
-    m_windowOptions.useQOpenGLWidgetViewport = enable;
-
-    WebViewGraphicsBased* view = static_cast<WebViewGraphicsBased*>(m_view);
-    view->setViewport(enable ? new QOpenGLWidget() : 0);
-#endif
+    view->setViewport(enable ? new QGLWidget() : 0);
 }
 #endif
 
diff --git a/Tools/QtTestBrowser/launcherwindow.h b/Tools/QtTestBrowser/launcherwindow.h
index 5cee7e5c7..9fd41a445 100644
--- a/Tools/QtTestBrowser/launcherwindow.h
+++ b/Tools/QtTestBrowser/launcherwindow.h
@@ -38,9 +38,6 @@
 #ifndef QT_NO_OPENGL
 #include <QtOpenGL/QGLWidget>
 #endif
-#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
-#include <QOpenGLWidget>
-#endif
 
 #include <QDebug>
 
@@ -67,54 +64,31 @@ struct HighlightedElement;
 
 class WindowOptions {
 public:
-    WindowOptions()
-        : useGraphicsView(false)
-        , useDiskCache(false)
-        , useCompositing(true)
-        , useTiledBackingStore(false)
-        , useWebGL(false)
-        , useWebAudio(false)
-        , useFrameFlattening(false)
-        , cacheWebView(false)
-        , showFrameRate(false)
-        , resizesToContents(false)
-        , viewportUpdateMode(QGraphicsView::MinimalViewportUpdate)
-        , useLocalStorage(false)
-        , useOfflineStorageDatabase(false)
-        , useOfflineWebApplicationCache(false)
-        , useDiskCookies(true)
-        , enableScrollAnimator(false)
-        , offlineStorageDefaultQuotaSize(0)
-        , useQGLWidgetViewport(false)
-        , useQOpenGLWidgetViewport(false)
-        , printLoadedUrls(false)
-        , startMaximized(false)
-    {
-    }
-
-    bool useGraphicsView;
-    bool useDiskCache;
-    bool useCompositing;
-    bool useTiledBackingStore;
-    bool useWebGL;
-    bool useWebAudio;
-    bool useFrameFlattening;
-    bool cacheWebView;
-    bool showFrameRate;
-    bool resizesToContents;
-    QGraphicsView::ViewportUpdateMode viewportUpdateMode;
-    bool useLocalStorage;
-    bool useOfflineStorageDatabase;
-    bool useOfflineWebApplicationCache;
-    bool useDiskCookies;
-    bool enableScrollAnimator;
-    quint64 offlineStorageDefaultQuotaSize;
-    bool useQGLWidgetViewport;
-    bool useQOpenGLWidgetViewport;
-    bool printLoadedUrls;
+    bool useGraphicsView { false };
+    bool useDiskCache { false };
+    bool useCompositing { false };
+    bool useTiledBackingStore { false };
+    bool useWebGL { false };
+    bool useWebAudio { false };
+    bool useMediaSource { false };
+    bool useFrameFlattening { false };
+    bool cacheWebView { false };
+    bool showFrameRate { false };
+    bool resizesToContents { false };
+    QGraphicsView::ViewportUpdateMode viewportUpdateMode { QGraphicsView::MinimalViewportUpdate };
+    bool useLocalStorage { false };
+    bool useOfflineStorageDatabase { false };
+    bool useOfflineWebApplicationCache { false };
+    bool useDiskCookies { true };
+    bool enableScrollAnimator { false };
+    quint64 offlineStorageDefaultQuotaSize { 0 };
+#ifndef QT_NO_OPENGL
+    bool useQGLWidgetViewport { false };
+#endif
+    bool printLoadedUrls { false };
     QUrl inspectorUrl;
-    quint16 remoteInspectorPort;
-    bool startMaximized;
+    quint16 remoteInspectorPort { 0 };
+    bool startMaximized { false };
 };
 
 class LauncherWindow : public MainWindow {
@@ -126,7 +100,7 @@ public:
 
     void sendTouchEvent();
 
-    bool eventFilter(QObject* obj, QEvent* event);
+    bool eventFilter(QObject*, QEvent*);
 
 protected Q_SLOTS:
     void loadStarted();
@@ -154,12 +128,12 @@ protected Q_SLOTS:
     void setTouchMocking(bool on);
     void toggleWebView(bool graphicsBased);
     void toggleAcceleratedCompositing(bool toggle);
-    void toggleAccelerated2dCanvas(bool toggle);
     void toggleTiledBackingStore(bool toggle);
     void toggleResizesToContents(bool toggle);
     void toggleWebGL(bool toggle);
     void toggleWebAudio(bool toggle);
-    void toggleSpatialNavigation(bool b);
+    void toggleMediaSource(bool toggle);
+    void toggleSpatialNavigation(bool enable);
     void toggleFullScreenMode(bool enable);
     void toggleFrameFlattening(bool toggle);
     void toggleJavaScriptEnabled(bool enable);
@@ -180,7 +154,6 @@ protected Q_SLOTS:
 #endif
 #ifndef QT_NO_OPENGL
     void toggleQGLWidgetViewport(bool enable);
-    void toggleQOpenGLWidgetViewport(bool enable);
 #endif
 
     void changeViewportUpdateMode(int mode);
@@ -229,7 +202,7 @@ private:
 
     QPropertyAnimation* m_zoomAnimation;
 #if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
-    QNetworkReply* m_reply;
+    QNetworkReply* m_reply { nullptr };
 #endif
     QList<QTouchEvent::TouchPoint> m_touchPoints;
     QList<HighlightedElement> m_highlightedElements;
@@ -239,8 +212,8 @@ private:
 #ifndef QT_NO_LINEEDIT
     QToolBar* m_findBar;
     QLineEdit* m_lineEdit;
-    int m_findFlag;
-    static const int s_findNormalFlag = 0;
+    int m_findFlag { 0 };
+    static const int s_findNormalFlag { 0 };
 #endif
 };
 
diff --git a/Tools/QtTestBrowser/locationedit.h b/Tools/QtTestBrowser/locationedit.h
index 85a7eb763..5750cba36 100644
--- a/Tools/QtTestBrowser/locationedit.h
+++ b/Tools/QtTestBrowser/locationedit.h
@@ -45,7 +45,7 @@ public:
     void setPageIcon(const QIcon&);
 
 public Q_SLOTS:
-    void setProgress(int progress);
+    void setProgress(int);
 
 private Q_SLOTS:
     void reset();
diff --git a/Tools/QtTestBrowser/mainwindow.h b/Tools/QtTestBrowser/mainwindow.h
index 203695247..70b3e5e1c 100644
--- a/Tools/QtTestBrowser/mainwindow.h
+++ b/Tools/QtTestBrowser/mainwindow.h
@@ -47,17 +47,17 @@ class MainWindow : public QMainWindow {
 public:
     MainWindow();
 
-    void addCompleterEntry(const QUrl& url);
+    void addCompleterEntry(const QUrl&);
 
     void load(const QString& url);
-    void load(const QUrl& url);
+    void load(const QUrl&);
 
     WebPage* page() const;
     void setPage(WebPage*);
 
 protected Q_SLOTS:
-    void setAddressUrl(const QString& url);
-    void setAddressUrl(const QUrl& url);
+    void setAddressUrl(const QString&);
+    void setAddressUrl(const QUrl&);
     void openFile();
     void openLocation();
     void changeLocation();
diff --git a/Tools/QtTestBrowser/qttestbrowser.cpp b/Tools/QtTestBrowser/qttestbrowser.cpp
index 7f96b5a65..05726b822 100644
--- a/Tools/QtTestBrowser/qttestbrowser.cpp
+++ b/Tools/QtTestBrowser/qttestbrowser.cpp
@@ -33,7 +33,6 @@
 
 #include "config.h"
 
-#include "DumpRenderTreeSupportQt.h"
 #include "launcherwindow.h"
 #include "urlloader.h"
 
@@ -53,7 +52,11 @@ int launcherMain(const QApplication& app)
 {
 #ifndef NDEBUG
     int retVal = app.exec();
-    DumpRenderTreeSupportQt::garbageCollectorCollect();
+
+#if HAVE(QTTESTSUPPORT)
+    WebKit::QtTestSupport::garbageCollectorCollect();
+#endif
+
     QWebSettings::clearMemoryCaches();
     return retVal;
 #else
@@ -133,9 +136,8 @@ void LauncherApplication::handleUserOptions()
              << "[-no-compositing]"
 #if defined(QT_CONFIGURED_WITH_OPENGL)
              << "[-gl-viewport]"
-#endif
-             << "[-opengl-viewport]"
              << "[-webgl]"
+#endif
              << QString("[-viewport-update-mode %1]").arg(formatKeys(updateModes)).toLatin1().data()
 #if !defined(QT_NO_NETWORKDISKCACHE) && !defined(QT_NO_DESKTOPSERVICES)
              << "[-disk-cache]"
@@ -167,6 +169,7 @@ void LauncherApplication::handleUserOptions()
         windowOptions.useGraphicsView = true;
 
     if (args.contains("-no-compositing")) {
+        requiresGraphicsView("-no-compositing");
         windowOptions.useCompositing = false;
     }
 
@@ -242,15 +245,11 @@ void LauncherApplication::handleUserOptions()
         windowOptions.useQGLWidgetViewport = true;
     }
 
-#endif
     if (args.contains("-webgl")) {
+        requiresGraphicsView("-webgl");
         windowOptions.useWebGL = true;
     }
-
-    if (args.contains("-opengl-viewport")) {
-        requiresGraphicsView("-opengl-viewport");
-        windowOptions.useQOpenGLWidgetViewport = true;
-    }
+#endif
 
 #if HAVE(QTTESTSUPPORT)
     if (args.contains("-use-test-fonts"))
diff --git a/Tools/QtTestBrowser/urlloader.h b/Tools/QtTestBrowser/urlloader.h
index 84254090f..53179c9e0 100644
--- a/Tools/QtTestBrowser/urlloader.h
+++ b/Tools/QtTestBrowser/urlloader.h
@@ -39,7 +39,7 @@ class UrlLoader : public QObject {
     Q_OBJECT
 
 public:
-    UrlLoader(QWebFrame* frame, const QString& inputFileName, int timeoutSeconds, int extraTimeSeconds);
+    UrlLoader(QWebFrame*, const QString& inputFileName, int timeoutSeconds, int extraTimeSeconds);
 
 public Q_SLOTS:
     void loadNext();
diff --git a/Tools/QtTestBrowser/utils.cpp b/Tools/QtTestBrowser/utils.cpp
index 567c989f7..0eb39fb48 100644
--- a/Tools/QtTestBrowser/utils.cpp
+++ b/Tools/QtTestBrowser/utils.cpp
@@ -47,7 +47,7 @@ QString formatKeys(QList<QString> keys)
     return result;
 }
 
-QList<QString> enumToKeys(const QMetaObject o, const QString& name, const QString& strip)
+QList<QString> enumToKeys(const QMetaObject &o, const QString& name, const QString& strip)
 {
     QList<QString> list;
 
diff --git a/Tools/QtTestBrowser/utils.h b/Tools/QtTestBrowser/utils.h
index b67351e3d..1f1aa2ebb 100644
--- a/Tools/QtTestBrowser/utils.h
+++ b/Tools/QtTestBrowser/utils.h
@@ -43,7 +43,7 @@
 // options handling
 QString takeOptionValue(QStringList* arguments, int index);
 QString formatKeys(QList<QString> keys);
-QList<QString> enumToKeys(const QMetaObject o, const QString& name, const QString& strip);
+QList<QString> enumToKeys(const QMetaObject&, const QString& name, const QString& strip);
 
 NO_RETURN void appQuit(int status, const QString& msg = QString());
 
diff --git a/Tools/QtTestBrowser/webpage.cpp b/Tools/QtTestBrowser/webpage.cpp
index a4bc78f8f..1a3ae3c82 100644
--- a/Tools/QtTestBrowser/webpage.cpp
+++ b/Tools/QtTestBrowser/webpage.cpp
@@ -77,13 +77,16 @@ void WebPage::applyProxy()
 
 bool WebPage::supportsExtension(QWebPage::Extension extension) const
 {
-    if (extension == QWebPage::ErrorPageExtension)
+    if (extension == ChooseMultipleFilesExtension || extension == QWebPage::ErrorPageExtension)
         return true;
     return false;
 }
 
 bool WebPage::extension(Extension extension, const ExtensionOption* option, ExtensionReturn* output)
 {
+    if (extension == ChooseMultipleFilesExtension)
+        return QWebPage::extension(extension, option, output);
+
     const QWebPage::ErrorPageExtensionOption* info = static_cast<const QWebPage::ErrorPageExtensionOption*>(option);
     QWebPage::ErrorPageExtensionReturn* errorPage = static_cast<QWebPage::ErrorPageExtensionReturn*>(output);
 
@@ -141,6 +144,11 @@ bool WebPage::shouldInterruptJavaScript()
     return QWebPage::shouldInterruptJavaScript();
 }
 
+void WebPage::javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID)
+{
+    qDebug() << "CONSOLE" << QString("%1:%2").arg(sourceID, lineNumber) << message;
+}
+
 void WebPage::authenticationRequired(QNetworkReply* reply, QAuthenticator* authenticator)
 {
     QDialog* dialog = new QDialog(QApplication::activeWindow());
diff --git a/Tools/QtTestBrowser/webpage.h b/Tools/QtTestBrowser/webpage.h
index 0965b56c9..959318018 100644
--- a/Tools/QtTestBrowser/webpage.h
+++ b/Tools/QtTestBrowser/webpage.h
@@ -44,22 +44,24 @@ public:
 
     virtual QWebPage* createWindow(QWebPage::WebWindowType);
     virtual QObject* createPlugin(const QString&, const QUrl&, const QStringList&, const QStringList&);
-    virtual bool supportsExtension(QWebPage::Extension extension) const;
-    virtual bool extension(Extension extension, const ExtensionOption* option, ExtensionReturn* output);
+    virtual bool supportsExtension(QWebPage::Extension) const;
+    virtual bool extension(Extension, const ExtensionOption*, ExtensionReturn*);
 
-    virtual bool acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& request, NavigationType type);
+    virtual bool acceptNavigationRequest(QWebFrame*, const QNetworkRequest&, NavigationType);
 
-    QString userAgentForUrl(const QUrl& url) const;
+    QString userAgentForUrl(const QUrl&) const;
     void setInterruptingJavaScriptEnabled(bool enabled) { m_interruptingJavaScriptEnabled = enabled; }
 
     virtual bool shouldInterruptJavaScript();
 
+    void javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID) override;
+
 public Q_SLOTS:
-    void openUrlInDefaultBrowser(const QUrl& url = QUrl());
+    void openUrlInDefaultBrowser(const QUrl& = QUrl());
     void setUserAgent(const QString& ua) { m_userAgent = ua; }
     void authenticationRequired(QNetworkReply*, QAuthenticator*);
-    void requestPermission(QWebFrame* frame, QWebPage::Feature feature);
-    void featurePermissionRequestCanceled(QWebFrame* frame, QWebPage::Feature feature);
+    void requestPermission(QWebFrame*, QWebPage::Feature);
+    void featurePermissionRequestCanceled(QWebFrame*, QWebPage::Feature);
 
 private:
     void applyProxy();
diff --git a/Tools/QtTestBrowser/webview.h b/Tools/QtTestBrowser/webview.h
index 56a61688a..a45a972b7 100644
--- a/Tools/QtTestBrowser/webview.h
+++ b/Tools/QtTestBrowser/webview.h
@@ -75,18 +75,18 @@ class WebViewGraphicsBased : public QGraphicsView {
 
 public:
     WebViewGraphicsBased(QWidget* parent);
-    void setPage(QWebPage* page);
+    void setPage(QWebPage*);
 
     void setItemCacheMode(QGraphicsItem::CacheMode mode) { graphicsWebView()->setCacheMode(mode); }
     QGraphicsItem::CacheMode itemCacheMode() { return graphicsWebView()->cacheMode(); }
 
-    void setFrameRateMeasurementEnabled(bool enabled);
+    void setFrameRateMeasurementEnabled(bool);
     bool frameRateMeasurementEnabled() const { return m_measureFps; }
 
     virtual void resizeEvent(QResizeEvent*);
-    virtual void paintEvent(QPaintEvent* event);
+    virtual void paintEvent(QPaintEvent*);
 
-    void setResizesToContents(bool b);
+    void setResizesToContents(bool);
     bool resizesToContents() const { return m_resizesToContents; }
 
     void setYRotation(qreal angle);