From 69dda76cc3d720d822d2bd35f49732ecc8199d75 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sat, 4 Nov 2017 12:43:39 +0300 Subject: Import WebKit commit 708de1520656bdf12023c04199ecab1b427d5e0c Change-Id: Id24f973470620b1c7a36576606b81f5df0fd75d0 Reviewed-by: Konstantin Tokarev --- Source/WebKit/PlatformQt.cmake | 74 ++++++++++++++++++++++++- Source/WebKit/qt/Api/qwebsettings.cpp | 4 -- Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp | 6 +- 3 files changed, 75 insertions(+), 9 deletions(-) (limited to 'Source/WebKit') diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake index 8708cedf8..f0e4acf8a 100644 --- a/Source/WebKit/PlatformQt.cmake +++ b/Source/WebKit/PlatformQt.cmake @@ -418,7 +418,7 @@ install( COMPONENT Data ) -file(GLOB WebKit_PRIVATE_HEADERS qt/Api/*_p.h) +file(GLOB WebKit_PRIVATE_HEADERS qt/Api/*_p.h ../WebKit2/UIProcess/API/qt/*_p.h) install( FILES ${WebKit_PRIVATE_HEADERS} @@ -519,11 +519,19 @@ if (KDE_INSTALL_USE_QT_SYS_PATHS) INCLUDE_INSTALL_DIR "$$QT_MODULE_LIB_BASE/QtWebKit.framework/Headers" MODULE_CONFIG "lib_bundle" ) + list(APPEND WebKit_Private_PRI_ARGUMENTS + INCLUDE_INSTALL_DIR "$$QT_MODULE_LIB_BASE/QtWebKit.framework/Headers/${PROJECT_VERSION}" + INCLUDE_INSTALL_DIR2 "$$QT_MODULE_LIB_BASE/QtWebKit.framework/Headers/${PROJECT_VERSION}/QtWebKit" + ) else () list(APPEND WebKit_PRI_ARGUMENTS INCLUDE_INSTALL_DIR "$$QT_MODULE_INCLUDE_BASE" INCLUDE_INSTALL_DIR2 "$$QT_MODULE_INCLUDE_BASE/QtWebKit" ) + list(APPEND WebKit_Private_PRI_ARGUMENTS + INCLUDE_INSTALL_DIR "$$QT_MODULE_INCLUDE_BASE/QtWebKit/${PROJECT_VERSION}" + INCLUDE_INSTALL_DIR2 "$$QT_MODULE_INCLUDE_BASE/QtWebKit/${PROJECT_VERSION}/QtWebKit" + ) endif () else () set(WebKit_PRI_ARGUMENTS @@ -534,14 +542,24 @@ else () INCLUDE_INSTALL_DIR "${LIB_INSTALL_DIR}/QtWebKit.framework/Headers" MODULE_CONFIG "lib_bundle" ) + list(APPEND WebKit_Private_PRI_ARGUMENTS + INCLUDE_INSTALL_DIR "${LIB_INSTALL_DIR}/QtWebKit.framework/Headers/${PROJECT_VERSION}" + INCLUDE_INSTALL_DIR2 "${LIB_INSTALL_DIR}/QtWebKit.framework/Headers/${PROJECT_VERSION}/QtWebKit" + ) else () list(APPEND WebKit_PRI_ARGUMENTS INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR} INCLUDE_INSTALL_DIR2 "${KDE_INSTALL_INCLUDEDIR}/QtWebKit" ) + list(APPEND WebKit_Private_PRI_ARGUMENTS + INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKit/${PROJECT_VERSION}" + INCLUDE_INSTALL_DIR2 "${KDE_INSTALL_INCLUDEDIR}/QtWebKit/${PROJECT_VERSION}/QtWebKit" + ) endif () endif () +list(APPEND WebKit_Private_PRI_ARGUMENTS MODULE_CONFIG "internal_module no_link") + if (MACOS_BUILD_FRAMEWORKS) set(WebKit_OUTPUT_NAME QtWebKit) else () @@ -561,7 +579,23 @@ ecm_generate_pri_file( FILENAME_VAR WebKit_PRI_FILENAME ${WebKit_PRI_ARGUMENTS} ) -install(FILES ${WebKit_PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR} COMPONENT Data) +ecm_generate_pri_file( + BASE_NAME webkit_private + NAME "QtWebKit" + LIB_NAME " " + DEPS "webkit" + RUNTIME_DEPS " " + DEFINES " " + QT_MODULES webkit + EXTRA_LIBS " " + FILENAME_VAR WebKit_Private_PRI_FILENAME + ${WebKit_Private_PRI_ARGUMENTS} +) +install( + FILES ${WebKit_PRI_FILENAME} ${WebKit_Private_PRI_FILENAME} + DESTINATION ${ECM_MKSPECS_INSTALL_DIR} + COMPONENT Data +) if (QT_STATIC_BUILD) set(WebKit_LIBRARY_TYPE STATIC) @@ -708,11 +742,19 @@ if (KDE_INSTALL_USE_QT_SYS_PATHS) INCLUDE_INSTALL_DIR "$$QT_MODULE_LIB_BASE/QtWebKitWidgets.framework/Headers" MODULE_CONFIG "lib_bundle" ) + list(APPEND WebKitWidgets_Private_PRI_ARGUMENTS + INCLUDE_INSTALL_DIR "$$QT_MODULE_LIB_BASE/QtWebKitWidgets.framework/Headers/${PROJECT_VERSION}" + INCLUDE_INSTALL_DIR2 "$$QT_MODULE_LIB_BASE/QtWebKitWidgets.framework/Headers/${PROJECT_VERSION}/QtWebKitWidgets" + ) else () list(APPEND WebKitWidgets_PRI_ARGUMENTS INCLUDE_INSTALL_DIR "$$QT_MODULE_INCLUDE_BASE" INCLUDE_INSTALL_DIR2 "$$QT_MODULE_INCLUDE_BASE/QtWebKitWidgets" ) + list(APPEND WebKitWidgets_Private_PRI_ARGUMENTS + INCLUDE_INSTALL_DIR "$$QT_MODULE_INCLUDE_BASE/QtWebKitWidgets/${PROJECT_VERSION}" + INCLUDE_INSTALL_DIR2 "$$QT_MODULE_INCLUDE_BASE/QtWebKitWidgets/${PROJECT_VERSION}/QtWebKitWidgets" + ) endif () else () set(WebKitWidgets_PRI_ARGUMENTS @@ -723,14 +765,24 @@ else () INCLUDE_INSTALL_DIR "${LIB_INSTALL_DIR}/QtWebKitWidgets.framework/Headers" MODULE_CONFIG "lib_bundle" ) + list(APPEND WebKitWidgets_Private_PRI_ARGUMENTS + INCLUDE_INSTALL_DIR "${LIB_INSTALL_DIR}/QtWebKitWidgets.framework/Headers/${PROJECT_VERSION}" + INCLUDE_INSTALL_DIR2 "${LIB_INSTALL_DIR}/QtWebKitWidgets.framework/Headers/${PROJECT_VERSION}/QtWebKitWidgets" + ) else () list(APPEND WebKitWidgets_PRI_ARGUMENTS INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR} INCLUDE_INSTALL_DIR2 "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets" ) + list(APPEND WebKitWidgets_Private_PRI_ARGUMENTS + INCLUDE_INSTALL_DIR "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets/${PROJECT_VERSION}" + INCLUDE_INSTALL_DIR2 "${KDE_INSTALL_INCLUDEDIR}/QtWebKitWidgets/${PROJECT_VERSION}/QtWebKitWidgets" + ) endif () endif () +list(APPEND WebKitWidgets_Private_PRI_ARGUMENTS MODULE_CONFIG "internal_module no_link") + if (MACOS_BUILD_FRAMEWORKS) set(WebKitWidgets_OUTPUT_NAME QtWebKitWidgets) else () @@ -749,7 +801,23 @@ ecm_generate_pri_file( FILENAME_VAR WebKitWidgets_PRI_FILENAME ${WebKitWidgets_PRI_ARGUMENTS} ) -install(FILES ${WebKitWidgets_PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR} COMPONENT Data) +ecm_generate_pri_file( + BASE_NAME webkitwidgets_private + NAME "QtWebKitWidgets" + LIB_NAME " " + DEPS "webkitwidgets" + RUNTIME_DEPS " " + DEFINES " " + QT_MODULES webkitwidgets + EXTRA_LIBS " " + FILENAME_VAR WebKitWidgets_Private_PRI_FILENAME + ${WebKitWidgets_Private_PRI_ARGUMENTS} +) +install( + FILES ${WebKitWidgets_PRI_FILENAME} ${WebKitWidgets_Private_PRI_FILENAME} + DESTINATION ${ECM_MKSPECS_INSTALL_DIR} + COMPONENT Data +) if (MSVC) if (CMAKE_SIZEOF_VOID_P EQUAL 8) diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index e6b32f52a..d552cec17 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -173,10 +173,6 @@ void QWebSettingsPrivate::apply() global->attributes.value(QWebSettings::WebGLEnabled)); settings->setWebGLEnabled(value); -#if ENABLE(CSS_SHADERS) - // For now, enable CSS shaders when WebGL is enabled. - settings->setCSSCustomFilterEnabled(value); -#endif #endif #if ENABLE(WEB_AUDIO) value = attributes.value(QWebSettings::WebAudioEnabled, global->attributes.value(QWebSettings::WebAudioEnabled)); diff --git a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp index d4afa40e7..8263aa17f 100644 --- a/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp +++ b/Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp @@ -36,8 +36,10 @@ QWEBKITWIDGETS_EXPORT void initializeWebKitWidgets() if (initialized) return; - setWebKitWidgetsInitCallback(QStyleFacadeImp::create); - initializeWebKitQt(); + if (qgetenv("QT_WEBKIT_THEME_NAME") != "mobile") { + setWebKitWidgetsInitCallback(QStyleFacadeImp::create); + initializeWebKitQt(); + } // QWebSettings::SearchCancelButtonGraphic setImagePlatformResource("searchCancelButton", QApplication::style()->standardPixmap(QStyle::SP_DialogCloseButton)); -- cgit v1.2.1