diff options
author | Konstantin Tokarev <annulen@yandex.ru> | 2017-11-12 11:53:48 +0300 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-14 18:16:59 +0000 |
commit | 35655d5f4bad248ead1700b59c381cc568b4e98b (patch) | |
tree | ca22a7389ebd323f98123f83591a8af72aeeb8d3 | |
parent | 69dda76cc3d720d822d2bd35f49732ecc8199d75 (diff) | |
download | qtwebkit-35655d5f4bad248ead1700b59c381cc568b4e98b.tar.gz |
Import WebKit commit 83f9eff575568815a8e7cf0f0b28300b0171f67e
Change-Id: I3d4c1bf98fe1d1aaad868f4a6210f241aa43a2eb
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
12 files changed, 15 insertions, 7 deletions
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h index 7882ddbd7..191f3090c 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h @@ -699,7 +699,7 @@ #endif #if !defined(USE_JSVALUE64) && !defined(USE_JSVALUE32_64) -#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ +#if (CPU(X86_64) && !defined(__ILP32__) && (OS(UNIX) || OS(WINDOWS))) \ || (CPU(IA64) && !CPU(IA64_32)) \ || CPU(ALPHA) \ || CPU(ARM64) \ diff --git a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp index 0f6855246..295e0cb48 100644 --- a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp +++ b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp @@ -50,7 +50,7 @@ DatabaseToWebProcessConnection::DatabaseToWebProcessConnection(IPC::Connection:: DatabaseToWebProcessConnection::~DatabaseToWebProcessConnection() { - + m_connection->invalidate(); } void DatabaseToWebProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder) diff --git a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h index a106d4161..421d65e62 100644 --- a/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h +++ b/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h @@ -37,7 +37,7 @@ namespace WebKit { class WebIDBConnectionToClient; -class DatabaseToWebProcessConnection : public RefCounted<DatabaseToWebProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender { +class DatabaseToWebProcessConnection : public RefCounted<DatabaseToWebProcessConnection>, private IPC::Connection::Client, private IPC::MessageSender { public: static Ref<DatabaseToWebProcessConnection> create(IPC::Connection::Identifier); ~DatabaseToWebProcessConnection(); diff --git a/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp index 812919890..f73f6932a 100644 --- a/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp +++ b/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp @@ -60,6 +60,7 @@ NetworkConnectionToWebProcess::NetworkConnectionToWebProcess(IPC::Connection::Id NetworkConnectionToWebProcess::~NetworkConnectionToWebProcess() { + m_connection->invalidate(); } void NetworkConnectionToWebProcess::didCleanupResourceLoader(NetworkResourceLoader& loader) diff --git a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp index 41df0e27f..b07738bbd 100644 --- a/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp +++ b/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp @@ -76,6 +76,9 @@ PluginProcessProxy::PluginProcessProxy(PluginProcessManager* PluginProcessManage PluginProcessProxy::~PluginProcessProxy() { + if (m_connection) + m_connection->invalidate(); + ASSERT(m_pendingFetchWebsiteDataRequests.isEmpty()); ASSERT(m_pendingFetchWebsiteDataCallbacks.isEmpty()); ASSERT(m_pendingDeleteWebsiteDataRequests.isEmpty()); diff --git a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h index c787c35f7..11dc20e17 100644 --- a/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h +++ b/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h @@ -33,7 +33,7 @@ namespace WebKit { -class WebIDBConnectionToServer final : public WebCore::IDBClient::IDBConnectionToServerDelegate, public IPC::MessageSender, public RefCounted<WebIDBConnectionToServer> { +class WebIDBConnectionToServer final : private WebCore::IDBClient::IDBConnectionToServerDelegate, private IPC::MessageSender, public RefCounted<WebIDBConnectionToServer> { public: static Ref<WebIDBConnectionToServer> create(); diff --git a/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp b/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp index fd51fdcde..7d132b9c9 100644 --- a/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp +++ b/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp @@ -46,6 +46,7 @@ WebToDatabaseProcessConnection::WebToDatabaseProcessConnection(IPC::Connection:: WebToDatabaseProcessConnection::~WebToDatabaseProcessConnection() { + m_connection->invalidate(); } void WebToDatabaseProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder) diff --git a/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h b/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h index 9edf49842..ac7b418cf 100644 --- a/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h +++ b/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h @@ -41,7 +41,7 @@ class SessionID; namespace WebKit { -class WebToDatabaseProcessConnection : public RefCounted<WebToDatabaseProcessConnection>, public IPC::Connection::Client, public IPC::MessageSender { +class WebToDatabaseProcessConnection : public RefCounted<WebToDatabaseProcessConnection>, private IPC::Connection::Client, private IPC::MessageSender { public: static Ref<WebToDatabaseProcessConnection> create(IPC::Connection::Identifier connectionIdentifier) { diff --git a/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp b/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp index 5564f6a0b..9eb88e150 100644 --- a/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp +++ b/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp @@ -49,6 +49,7 @@ NetworkProcessConnection::NetworkProcessConnection(IPC::Connection::Identifier c NetworkProcessConnection::~NetworkProcessConnection() { + m_connection->invalidate(); } void NetworkProcessConnection::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder) diff --git a/Source/WebKit2/WebProcess/WebPage/WebInspector.h b/Source/WebKit2/WebProcess/WebPage/WebInspector.h index 8dbf66104..f1541f640 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebInspector.h +++ b/Source/WebKit2/WebProcess/WebPage/WebInspector.h @@ -37,7 +37,7 @@ namespace WebKit { class WebPage; -class WebInspector : public API::ObjectImpl<API::Object::Type::BundleInspector>, public IPC::Connection::Client, public Inspector::FrontendChannel { +class WebInspector : public API::ObjectImpl<API::Object::Type::BundleInspector>, private IPC::Connection::Client, public Inspector::FrontendChannel { public: static Ref<WebInspector> create(WebPage*); diff --git a/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h b/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h index d6fad8318..61d4434f4 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h +++ b/Source/WebKit2/WebProcess/WebPage/WebInspectorUI.h @@ -39,7 +39,7 @@ namespace WebKit { class WebPage; -class WebInspectorUI : public RefCounted<WebInspectorUI>, public IPC::Connection::Client, public WebCore::InspectorFrontendClient { +class WebInspectorUI : public RefCounted<WebInspectorUI>, private IPC::Connection::Client, public WebCore::InspectorFrontendClient { public: static Ref<WebInspectorUI> create(WebPage&); diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake index 57ea7051d..de180ee56 100644 --- a/Source/cmake/OptionsQt.cmake +++ b/Source/cmake/OptionsQt.cmake @@ -294,6 +294,8 @@ WEBKIT_OPTION_DEPEND(ENABLE_MEDIA_SOURCE USE_GSTREAMER) WEBKIT_OPTION_DEPEND(ENABLE_QT_WEBCHANNEL ENABLE_WEBKIT2) +WEBKIT_OPTION_DEPEND(ENABLE_TOUCH_ADJUSTMENT ENABLE_QT_GESTURE_EVENTS) + # While it's possible to have UI-less NPAPI plugins without X11, we don't support this case yet if (UNIX AND NOT APPLE) WEBKIT_OPTION_DEPEND(ENABLE_NETSCAPE_PLUGIN_API ENABLE_X11_TARGET) |