Import WebKit commit 85c24b4e854b971f0705bb3411cfd4c0b821f491

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

5 files changed, 27 insertions, 6 deletions

diff --git a/Tools/DumpRenderTree/CMakeLists.txt b/Tools/DumpRenderTree/CMakeLists.txt
index db6ef4304..4a726ccaf 100644
--- a/Tools/DumpRenderTree/CMakeLists.txt
+++ b/Tools/DumpRenderTree/CMakeLists.txt
@@ -1,3 +1,5 @@
+QTWEBKIT_SKIP_AUTOMOC(DumpRenderTree)
+
 set(DumpRenderTree_SOURCES
     AccessibilityController.cpp
     AccessibilityTextMarker.cpp
@@ -130,4 +132,7 @@ endif ()
 
 if (${PORT} STREQUAL "Qt")
     set_target_properties(DumpRenderTree PROPERTIES AUTOMOC ON)
+    if (ENABLE_NETSCAPE_PLUGIN_API)
+        target_compile_definitions(TestNetscapePlugin PRIVATE QT_NO_VERSION_TAGGING)
+    endif ()
 endif ()
diff --git a/Tools/MiniBrowser/qt/CMakeLists.txt b/Tools/MiniBrowser/qt/CMakeLists.txt
index e77d3bd54..68dd13c8b 100644
--- a/Tools/MiniBrowser/qt/CMakeLists.txt
+++ b/Tools/MiniBrowser/qt/CMakeLists.txt
@@ -53,6 +53,12 @@ set(MiniBrowser_LIBRARIES
     ${Qt5Quick_LIBRARIES}
 )
 
+if (SHARED_CORE)
+    list(APPEND MiniBrowser_LIBRARIES
+        WebKit2
+    )
+endif ()
+
 if (ENABLE_TEST_SUPPORT)
     add_definitions(-DHAVE_QTTESTSUPPORT)
 endif ()
diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp
index 0fd64654e..59851883e 100644
--- a/Tools/QtTestBrowser/launcherwindow.cpp
+++ b/Tools/QtTestBrowser/launcherwindow.cpp
@@ -345,6 +345,9 @@ void LauncherWindow::createChrome()
     spatialNavigationAction->setCheckable(true);
     spatialNavigationAction->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_S));
 
+    QAction* caretBrowsingAction = toolsMenu->addAction("Toggle Caret Browsing", this, SLOT(toggleCaretBrowsing(bool)));
+    caretBrowsingAction->setCheckable(true);
+
     QAction* toggleFrameFlattening = toolsMenu->addAction("Toggle Frame Flattening", this, SLOT(toggleFrameFlattening(bool)));
     toggleFrameFlattening->setCheckable(true);
     toggleFrameFlattening->setChecked(settings->testAttribute(QWebSettings::FrameFlatteningEnabled));
@@ -972,6 +975,11 @@ void LauncherWindow::toggleSpatialNavigation(bool enable)
     page()->settings()->setAttribute(QWebSettings::SpatialNavigationEnabled, enable);
 }
 
+void LauncherWindow::toggleCaretBrowsing(bool enable)
+{
+    page()->settings()->setAttribute(QWebSettings::CaretBrowsingEnabled, enable);
+}
+
 void LauncherWindow::toggleFullScreenMode(bool enable)
 {
     bool alreadyEnabled = windowState() & Qt::WindowFullScreen;
@@ -1164,9 +1172,13 @@ void LauncherWindow::downloadRequest(const QNetworkRequest &request)
 
 void LauncherWindow::fileDownloadFinished()
 {
-    QFileInfo fileInf(m_reply->request().url().toString());
-    QString requestFileName = QDir::homePath() + "/" + fileInf.fileName();
-    QString fileName = QFileDialog::getSaveFileName(this, "Save as...", requestFileName, "All Files (*)");
+    QString suggestedFileName;
+    if (m_reply->request().url().scheme().toLower() != QLatin1String("data")) {
+        QFileInfo fileInf(m_reply->request().url().toString());
+        suggestedFileName = QDir::homePath() + "/" + fileInf.fileName();
+    } else
+        suggestedFileName = QStringLiteral("data");
+    QString fileName = QFileDialog::getSaveFileName(this, "Save as...", suggestedFileName, "All Files (*)");
 
     if (fileName.isEmpty())
         return;
diff --git a/Tools/QtTestBrowser/launcherwindow.h b/Tools/QtTestBrowser/launcherwindow.h
index a05a6cd56..e475a8022 100644
--- a/Tools/QtTestBrowser/launcherwindow.h
+++ b/Tools/QtTestBrowser/launcherwindow.h
@@ -137,6 +137,7 @@ protected Q_SLOTS:
     void toggleWebAudio(bool toggle);
     void toggleMediaSource(bool toggle);
     void toggleSpatialNavigation(bool enable);
+    void toggleCaretBrowsing(bool enable);
     void toggleFullScreenMode(bool enable);
     void toggleFrameFlattening(bool toggle);
     void toggleJavaScriptEnabled(bool enable);
diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf
index 3e0d40610..3699d6b71 100644
--- a/Tools/qmake/mkspecs/features/functions.prf
+++ b/Tools/qmake/mkspecs/features/functions.prf
@@ -66,9 +66,6 @@ defineTest(isPlatformSupported) {
     }
 
     win32 {
-        qtConfig(opengles2):!qtConfig(dynamicgl) {
-            skipBuild("QtWebKit supports only dynamic GL Qt builds on Windows at the moment.")
-        }
         winrt {
             skipBuild("WinRT is not supported.")
         }