diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2017-11-04 12:43:39 +0300 |
---|---|---|
committer | Konstantin Tokarev <annulen@yandex.ru> | 2017-11-04 18:45:36 +0000 |
commit | 69dda76cc3d720d822d2bd35f49732ecc8199d75 (patch) | |
tree | 50a8953d6363a98c27d104647a99d0272f03653d | |
parent | aa80d42eb3696071da31827ff27b3963eda59ac0 (diff) | |
download | qtwebkit-69dda76cc3d720d822d2bd35f49732ecc8199d75.tar.gz |
Import WebKit commit 708de1520656bdf12023c04199ecab1b427d5e0c
Change-Id: Id24f973470620b1c7a36576606b81f5df0fd75d0
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | Source/JavaScriptCore/CMakeLists.txt | 1 | ||||
-rw-r--r-- | Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h | 1 | ||||
-rw-r--r-- | Source/WTF/wtf/Platform.h | 2 | ||||
-rw-r--r-- | Source/WebKit/PlatformQt.cmake | 74 | ||||
-rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 4 | ||||
-rw-r--r-- | Source/WebKit/qt/WidgetSupport/InitWebKitQt.cpp | 6 | ||||
-rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp | 9 | ||||
-rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h | 1 | ||||
-rw-r--r-- | Source/WebKit2/UIProcess/qt/QtPageClient.cpp | 13 | ||||
-rw-r--r-- | Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h | 1 | ||||
-rw-r--r-- | Source/WebKit2/UIProcess/qt/WebFullScreenManagerProxyQt.cpp | 86 | ||||
-rw-r--r-- | Source/cmake/WebKitMacros.cmake | 2 |
13 files changed, 92 insertions, 110 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e308c4755..fb92a7a5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,8 @@ if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") set(WTF_CPU_ARM 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") set(WTF_CPU_ARM64 1) +elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha*") + set(WTF_CPU_ALPHA 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") set(WTF_CPU_MIPS 1) elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sh4") diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt index a207c0f60..937b3ed00 100644 --- a/Source/JavaScriptCore/CMakeLists.txt +++ b/Source/JavaScriptCore/CMakeLists.txt @@ -1277,6 +1277,7 @@ endif () if (WTF_CPU_ARM) elseif (WTF_CPU_ARM64) +elseif (WTF_CPU_ALPHA) elseif (WTF_CPU_HPPA) elseif (WTF_CPU_PPC) elseif (WTF_CPU_PPC64) diff --git a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h index e7592c0b0..f694bf6b8 100644 --- a/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h +++ b/Source/JavaScriptCore/runtime/JSGenericTypedArrayViewConstructorInlines.h @@ -32,6 +32,7 @@ #include "JSCJSValueInlines.h" #include "JSDataView.h" #include "JSGenericTypedArrayViewConstructor.h" +#include "JSGenericTypedArrayViewInlines.h" #include "JSGlobalObject.h" #include "StructureInlines.h" diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h index 0666ac710..7882ddbd7 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h @@ -348,7 +348,7 @@ #endif /* ARM */ -#if CPU(ARM) || CPU(MIPS) || CPU(SH4) +#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ALPHA) || CPU(HPPA) #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 #endif 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)); diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp b/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp index a056173e8..c781a97ca 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp @@ -66,10 +66,6 @@ bool QWebPreferencesPrivate::testAttribute(QWebPreferencesPrivate::WebAttribute #if ENABLE(WEBGL) case WebGLEnabled: return WKPreferencesGetWebGLEnabled(preferencesRef); -#if ENABLE(CSS_SHADERS) - case CSSCustomFilterEnabled: - return WKPreferencesGetCSSCustomFilterEnabled(preferencesRef); -#endif #endif #if ENABLE(WEB_AUDIO) case WebAudioEnabled: @@ -135,11 +131,6 @@ void QWebPreferencesPrivate::setAttribute(QWebPreferencesPrivate::WebAttribute a case WebGLEnabled: WKPreferencesSetWebGLEnabled(preferencesRef, enable); break; -#if ENABLE(CSS_SHADERS) - case CSSCustomFilterEnabled: - WKPreferencesSetCSSCustomFilterEnabled(preferencesRef, enable); - break; -#endif #endif #if ENABLE(WEB_AUDIO) case WebAudioEnabled: diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h index f978a5bd2..2b4c804ff 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwebpreferences_p_p.h @@ -38,7 +38,6 @@ public: DnsPrefetchEnabled, DeveloperExtrasEnabled, WebGLEnabled, - CSSCustomFilterEnabled, WebAudioEnabled, CaretBrowsingEnabled, NotificationsEnabled, diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp index 5f62dc600..53faa7647 100644 --- a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp +++ b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp @@ -288,12 +288,21 @@ bool QtPageClient::isFullScreen() void QtPageClient::enterFullScreen() { - notImplemented(); + if (!m_webView) + return; + + WebFullScreenManagerProxy* manager = m_eventHandler->webPageProxy()->fullScreenManager(); + manager->willEnterFullScreen(); + emit m_webView->experimental()->enterFullScreenRequested(); + manager->didEnterFullScreen(); } void QtPageClient::exitFullScreen() { - notImplemented(); + WebFullScreenManagerProxy* manager = m_eventHandler->webPageProxy()->fullScreenManager(); + manager->willExitFullScreen(); + emit m_webView->experimental()->exitFullScreenRequested(); + manager->didExitFullScreen(); } void QtPageClient::beganEnterFullScreen(const IntRect& initialFrame, const IntRect& finalFrame) diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h index 2fe82e8e0..32c7f3f0d 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h +++ b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h @@ -93,6 +93,7 @@ public: void resetGestureRecognizers(); PageViewportControllerClientQt* viewportController() { return m_viewportController; } + WebPageProxy* webPageProxy() { return m_webPageProxy; } void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage); diff --git a/Source/WebKit2/UIProcess/qt/WebFullScreenManagerProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebFullScreenManagerProxyQt.cpp deleted file mode 100644 index 2b97dc722..000000000 --- a/Source/WebKit2/UIProcess/qt/WebFullScreenManagerProxyQt.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public License - * along with this library; see the file COPYING.LIB. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#include "config.h" -#include "WebFullScreenManagerProxy.h" - -#if ENABLE(FULLSCREEN_API) - -#include "WebContext.h" -#include "WebFullScreenManagerMessages.h" -#include "WebFullScreenManagerProxyMessages.h" -#include <WebCore/NotImplemented.h> - -#if HAVE(QTQUICK) -#include "qquickwebview_p.h" -#endif - -using namespace WebCore; - -namespace WebKit { - -void WebFullScreenManagerProxy::invalidate() -{ -#if HAVE(QTQUICK) - m_webView = 0; -#endif -} - -void WebFullScreenManagerProxy::close() -{ - notImplemented(); -} - -bool WebFullScreenManagerProxy::isFullScreen() -{ - notImplemented(); - return false; -} - -void WebFullScreenManagerProxy::enterFullScreen() -{ - willEnterFullScreen(); -#if HAVE(QTQUICK) - emit m_webView->experimental()->enterFullScreenRequested(); -#endif - didEnterFullScreen(); -} - -void WebFullScreenManagerProxy::exitFullScreen() -{ - willExitFullScreen(); -#if HAVE(QTQUICK) - emit m_webView->experimental()->exitFullScreenRequested(); -#endif - didExitFullScreen(); -} - -void WebFullScreenManagerProxy::beganEnterFullScreen(const IntRect& initialFrame, const IntRect& finalFrame) -{ - notImplemented(); -} - -void WebFullScreenManagerProxy::beganExitFullScreen(const IntRect& initialFrame, const IntRect& finalFrame) -{ - notImplemented(); -} - -} // namespace WebKit - -#endif // ENABLE(FULLSCREEN_API) diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake index 07e31432a..a34e85463 100644 --- a/Source/cmake/WebKitMacros.cmake +++ b/Source/cmake/WebKitMacros.cmake @@ -265,8 +265,6 @@ macro(WEBKIT_FRAMEWORK _target) ${${_target}_HEADERS} ${${_target}_SOURCES} ${${_target}_DERIVED_SOURCES} - ${${_target}_PRIVATE_HEADERS} - ${${_target}_PUBLIC_HEADERS} ) target_link_libraries(${_target} ${${_target}_LIBRARIES}) set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}") |