Import WebKit commit 3040e0455efecd271f1aeef53cf287e75486a70d

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

7 files changed, 86 insertions, 7 deletions

diff --git a/Tools/DumpRenderTree/PlatformQt.cmake b/Tools/DumpRenderTree/PlatformQt.cmake
index a914dfd8d..e2e26e46d 100644
--- a/Tools/DumpRenderTree/PlatformQt.cmake
+++ b/Tools/DumpRenderTree/PlatformQt.cmake
@@ -1,6 +1,6 @@
 list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
-    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/QtWebKit"
-    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/QtWebKitWidgets"
+    "${FORWARDING_HEADERS_DIR}/QtWebKit"
+    "${FORWARDING_HEADERS_DIR}/QtWebKitWidgets"
     "${WEBCORE_DIR}/Modules/notifications"
     "${WEBCORE_DIR}/platform/qt"
     "${WEBKIT_DIR}/qt/WebCoreSupport"
diff --git a/Tools/MiniBrowser/qt/CMakeLists.txt b/Tools/MiniBrowser/qt/CMakeLists.txt
new file mode 100644
index 000000000..0d5c7783f
--- /dev/null
+++ b/Tools/MiniBrowser/qt/CMakeLists.txt
@@ -0,0 +1,64 @@
+set(MiniBrowser_INCLUDE_DIRECTORIES
+    ${CMAKE_BINARY_DIR}
+    "${CMAKE_SOURCE_DIR}/Source"
+    "${FORWARDING_HEADERS_DIR}/QtWebKit"
+    "${WEBKIT_DIR}/qt/Api"
+    "${WEBKIT_DIR}/qt/WebCoreSupport"
+    "${WEBKIT2_DIR}/UIProcess/API/qt"
+    ${WTF_DIR}
+)
+
+set(MiniBrowser_QML_SOURCES
+    qml/AlertDialog.qml
+    qml/AuthenticationDialog.qml
+    qml/BrowserWindow.qml
+    qml/CheckBox.qml
+    qml/ColorChooser.qml
+    qml/ConfirmDialog.qml
+    qml/Dialog.qml
+    qml/DialogButton.qml
+    qml/DialogLineInput.qml
+    qml/FilePicker.qml
+    qml/ItemSelector.qml
+    qml/MockTouchPoint.qml
+    qml/PromptDialog.qml
+    qml/ProxyAuthenticationDialog.qml
+    qml/ScrollIndicator.qml
+    qml/ViewportInfoItem.qml
+)
+
+set(QML_IMPORT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/qml ${CMAKE_BINARY_DIR}/imports
+    CACHE STRING "" FORCE)
+
+set(MiniBrowser_SOURCES
+    BrowserWindow.cpp
+    MiniBrowserApplication.cpp
+    UrlLoader.cpp
+    main.cpp
+    utils.cpp
+    ${MiniBrowser_QML_SOURCES}
+)
+
+qt5_add_resources(MiniBrowser_SOURCES
+    MiniBrowser.qrc
+)
+
+set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES
+    ${Qt5Quick_INCLUDE_DIRS}
+    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
+)
+
+set(MiniBrowser_LIBRARIES
+    WebKit
+    ${Qt5Quick_LIBRARIES}
+)
+
+if (ENABLE_TEST_SUPPORT)
+    add_definitions(-DHAVE_QTTESTSUPPORT)
+endif ()
+
+include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
+include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
+add_executable(MiniBrowser ${MiniBrowser_SOURCES})
+target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
+set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
diff --git a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
index f2eadba94..7dbb4c519 100644
--- a/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
+++ b/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp
@@ -330,7 +330,8 @@ void MiniBrowserApplication::handleUserOptions()
     if (useDesktopBehavior)
         windowOptions()->setTouchMockingEnabled(false);
 
-    QQuickWebViewExperimental::setFlickableViewportEnabled(!useDesktopBehavior);
+    // QTFIXME: flickable viewport has painting artifacts so we cannot enable it by default
+    // QQuickWebViewExperimental::setFlickableViewportEnabled(!useDesktopBehavior);
     if (!useDesktopBehavior)
         qputenv("QT_WEBKIT_USE_MOBILE_THEME", QByteArray("1"));
     m_windowOptions.setPrintLoadedUrls(takeOptionFlag(&args, "-v"));
diff --git a/Tools/PlatformQt.cmake b/Tools/PlatformQt.cmake
index 311156446..9c5548aa3 100644
--- a/Tools/PlatformQt.cmake
+++ b/Tools/PlatformQt.cmake
@@ -2,7 +2,7 @@ remove_definitions(-DQT_ASCII_CAST_WARNINGS)
 
 add_subdirectory(QtTestBrowser)
 
-if (ENABLE_API_TESTS)
+if (ENABLE_API_TESTS AND NOT ENABLE_WEBKIT2)
     add_subdirectory(TestWebKitAPI)
 endif ()
 
@@ -10,3 +10,10 @@ if (ENABLE_TEST_SUPPORT)
     add_subdirectory(DumpRenderTree)
     add_subdirectory(ImageDiff)
 endif ()
+
+if (ENABLE_WEBKIT2)
+    add_subdirectory(MiniBrowser/qt)
+endif ()
+
+# FIXME: Remove when WK2 Tools patches are merged
+set(ENABLE_WEBKIT2 0)
diff --git a/Tools/QtTestBrowser/CMakeLists.txt b/Tools/QtTestBrowser/CMakeLists.txt
index ab625f6e5..f43bb7852 100644
--- a/Tools/QtTestBrowser/CMakeLists.txt
+++ b/Tools/QtTestBrowser/CMakeLists.txt
@@ -2,9 +2,9 @@ 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"
+    "${FORWARDING_HEADERS_DIR}"
+    "${FORWARDING_HEADERS_DIR}/QtWebKit"
+    "${FORWARDING_HEADERS_DIR}/QtWebKitWidgets"
     "${JAVASCRIPTCORE_DIR}"
     "${JAVASCRIPTCORE_DIR}/runtime"
     "${WEBCORE_DIR}"
diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt
index b81377a6d..6355772ce 100644
--- a/Tools/WebKitTestRunner/CMakeLists.txt
+++ b/Tools/WebKitTestRunner/CMakeLists.txt
@@ -63,6 +63,7 @@ set(WebKitTestRunner_INCLUDE_DIRECTORIES
 
 set(WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
     ${LIBSOUP_INCLUDE_DIRS}
+    ${ICU_INCLUDE_DIRS}
 )
 
 set(WebKitTestRunnerInjectedBundle_SOURCES
diff --git a/Tools/qt/manifest.txt b/Tools/qt/manifest.txt
index 8affd54a2..a09153070 100644
--- a/Tools/qt/manifest.txt
+++ b/Tools/qt/manifest.txt
@@ -83,6 +83,12 @@ file Source/WTF/wtf/cocoa
 file Source/WTF/wtf/text/cf
 file Source/WebCore/platform/cf/SharedBufferCF.cpp
 
+# WK2 on Windows and macOS
+file Source/WebKit2/Platform/IPC/mac
+file Source/WebKit2/Platform/IPC/win
+file Source/WebKit2/Platform/mac
+file Source/WebKit2/Platform/win
+
 # WK1 plugin code is in WebKit/win
 file Source/WebKit/win/Plugins