Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog (197666 => 197667)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-03-07 09:56:32 UTC (rev 197666)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-03-07 09:58:28 UTC (rev 197667)
@@ -1,3 +1,31 @@
+2016-02-29 Brady Eidson <[email protected]>
+
+ Modern IDB: WebKit 2 IPC layer easily confused about multiple web processes being connected.
+ https://bugs.webkit.org/show_bug.cgi?id=154837
+
+ Reviewed by Alex Christensen.
+
+ The crux of the bug is that WebProcesses cannot assign themselves server-unique identifiers...
+ The server must do that for them.
+
+ A once-per-session-per-WebProcess sync message and a few updates to connection management fix this.
+
+ * DatabaseProcess/DatabaseToWebProcessConnection.cpp:
+ (WebKit::DatabaseToWebProcessConnection::didReceiveSyncMessage):
+ (WebKit::generateConnectionToServerIdentifier):
+ (WebKit::DatabaseToWebProcessConnection::establishIDBConnectionToServer):
+ * DatabaseProcess/DatabaseToWebProcessConnection.h:
+ * DatabaseProcess/DatabaseToWebProcessConnection.messages.in:
+
+ * WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp:
+ (WebKit::WebIDBConnectionToServer::WebIDBConnectionToServer):
+ (WebKit::generateConnectionToServerIdentifier): Deleted.
+
+ * WebProcess/Databases/WebToDatabaseProcessConnection.cpp:
+ (WebKit::WebToDatabaseProcessConnection::didReceiveMessage):
+ (WebKit::WebToDatabaseProcessConnection::idbConnectionToServerForSession):
+ * WebProcess/Databases/WebToDatabaseProcessConnection.h:
+
2016-02-29 Konstantin Tokarev <[email protected]>
Fixed compilation with !ENABLE(DATABASE_PROCESS).
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp (197666 => 197667)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2016-03-07 09:56:32 UTC (rev 197666)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.cpp 2016-03-07 09:58:28 UTC (rev 197667)
@@ -72,6 +72,16 @@
ASSERT_NOT_REACHED();
}
+void DatabaseToWebProcessConnection::didReceiveSyncMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder, std::unique_ptr<IPC::MessageEncoder>& replyEncoder)
+{
+ if (decoder.messageReceiverName() == Messages::DatabaseToWebProcessConnection::messageReceiverName()) {
+ didReceiveSyncDatabaseToWebProcessConnectionMessage(connection, decoder, replyEncoder);
+ return;
+ }
+
+ ASSERT_NOT_REACHED();
+}
+
void DatabaseToWebProcessConnection::didClose(IPC::Connection&)
{
#if ENABLE(INDEXED_DATABASE)
@@ -85,8 +95,17 @@
}
#if ENABLE(INDEXED_DATABASE)
-void DatabaseToWebProcessConnection::establishIDBConnectionToServer(uint64_t serverConnectionIdentifier)
+
+static uint64_t generateConnectionToServerIdentifier()
{
+ ASSERT(RunLoop::isMain());
+ static uint64_t identifier = 0;
+ return ++identifier;
+}
+
+void DatabaseToWebProcessConnection::establishIDBConnectionToServer(uint64_t& serverConnectionIdentifier)
+{
+ serverConnectionIdentifier = generateConnectionToServerIdentifier();
LOG(IndexedDB, "DatabaseToWebProcessConnection::establishIDBConnectionToServer - %" PRIu64, serverConnectionIdentifier);
ASSERT(!m_webIDBConnections.contains(serverConnectionIdentifier));
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h (197666 => 197667)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h 2016-03-07 09:56:32 UTC (rev 197666)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.h 2016-03-07 09:58:28 UTC (rev 197667)
@@ -49,11 +49,13 @@
// IPC::Connection::Client
virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
+ virtual void didReceiveSyncMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&) override;
virtual void didClose(IPC::Connection&) override;
virtual void didReceiveInvalidMessage(IPC::Connection&, IPC::StringReference messageReceiverName, IPC::StringReference messageName) override;
virtual IPC::ProcessType localProcessType() override { return IPC::ProcessType::Database; }
virtual IPC::ProcessType remoteProcessType() override { return IPC::ProcessType::Web; }
void didReceiveDatabaseToWebProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&);
+ void didReceiveSyncDatabaseToWebProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&, std::unique_ptr<IPC::MessageEncoder>&);
// IPC::MessageSender
virtual IPC::Connection* messageSenderConnection() override { return m_connection.get(); }
@@ -61,7 +63,7 @@
#if ENABLE(INDEXED_DATABASE)
// Messages handlers (Modern IDB)
- void establishIDBConnectionToServer(uint64_t serverConnectionIdentifier);
+ void establishIDBConnectionToServer(uint64_t& serverConnectionIdentifier);
void removeIDBConnectionToServer(uint64_t serverConnectionIdentifier);
HashMap<uint64_t, RefPtr<WebIDBConnectionToClient>> m_webIDBConnections;
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.messages.in (197666 => 197667)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.messages.in 2016-03-07 09:56:32 UTC (rev 197666)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/DatabaseProcess/DatabaseToWebProcessConnection.messages.in 2016-03-07 09:58:28 UTC (rev 197667)
@@ -25,7 +25,7 @@
messages -> DatabaseToWebProcessConnection LegacyReceiver {
#if ENABLE(INDEXED_DATABASE)
# Creates a connection for communication with a WebProcess
- EstablishIDBConnectionToServer(uint64_t serverConnectionIdentifier)
+ EstablishIDBConnectionToServer() -> (uint64_t serverConnectionIdentifier)
RemoveIDBConnectionToServer(uint64_t serverConnectionIdentifier)
#endif
}
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp (197666 => 197667)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2016-03-07 09:56:32 UTC (rev 197666)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.cpp 2016-03-07 09:58:28 UTC (rev 197667)
@@ -49,27 +49,17 @@
namespace WebKit {
-static uint64_t generateConnectionToServerIdentifier()
-{
- ASSERT(RunLoop::isMain());
- static uint64_t identifier = 0;
- return ++identifier;
-}
-
Ref<WebIDBConnectionToServer> WebIDBConnectionToServer::create()
{
return adoptRef(*new WebIDBConnectionToServer);
}
WebIDBConnectionToServer::WebIDBConnectionToServer()
- : m_identifier(generateConnectionToServerIdentifier())
{
relaxAdoptionRequirement();
m_connectionToServer = IDBClient::IDBConnectionToServer::create(*this);
- send(Messages::DatabaseToWebProcessConnection::EstablishIDBConnectionToServer(m_identifier));
-
- m_isOpenInServer = true;
+ m_isOpenInServer = sendSync(Messages::DatabaseToWebProcessConnection::EstablishIDBConnectionToServer(), m_identifier);
}
WebIDBConnectionToServer::~WebIDBConnectionToServer()
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp (197666 => 197667)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp 2016-03-07 09:56:32 UTC (rev 197666)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.cpp 2016-03-07 09:58:28 UTC (rev 197667)
@@ -52,8 +52,8 @@
{
#if ENABLE(INDEXED_DATABASE)
if (decoder.messageReceiverName() == Messages::WebIDBConnectionToServer::messageReceiverName()) {
- auto iterator = m_webIDBConnections.find(decoder.destinationID());
- if (iterator != m_webIDBConnections.end())
+ auto iterator = m_webIDBConnectionsByIdentifier.find(decoder.destinationID());
+ if (iterator != m_webIDBConnectionsByIdentifier.end())
iterator->value->didReceiveMessage(connection, decoder);
return;
}
@@ -74,9 +74,12 @@
#if ENABLE(INDEXED_DATABASE)
WebIDBConnectionToServer& WebToDatabaseProcessConnection::idbConnectionToServerForSession(const SessionID& sessionID)
{
- auto result = m_webIDBConnections.add(sessionID.sessionID(), nullptr);
- if (result.isNewEntry)
+ auto result = m_webIDBConnectionsBySession.add(sessionID, nullptr);
+ if (result.isNewEntry) {
result.iterator->value = WebIDBConnectionToServer::create();
+ ASSERT(!m_webIDBConnectionsByIdentifier.contains(result.iterator->value->identifier()));
+ m_webIDBConnectionsByIdentifier.set(result.iterator->value->identifier(), result.iterator->value);
+ }
return *result.iterator->value;
}
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h (197666 => 197667)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h 2016-03-07 09:56:32 UTC (rev 197666)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Databases/WebToDatabaseProcessConnection.h 2016-03-07 09:58:28 UTC (rev 197667)
@@ -30,6 +30,7 @@
#include "Connection.h"
#include "MessageSender.h"
#include "WebIDBConnectionToServer.h"
+#include <WebCore/SessionID.h>
#include <wtf/RefCounted.h>
#if ENABLE(DATABASE_PROCESS)
@@ -71,7 +72,8 @@
RefPtr<IPC::Connection> m_connection;
#if ENABLE(INDEXED_DATABASE)
- HashMap<uint64_t, RefPtr<WebIDBConnectionToServer>> m_webIDBConnections;
+ HashMap<WebCore::SessionID, RefPtr<WebIDBConnectionToServer>> m_webIDBConnectionsBySession;
+ HashMap<uint64_t, RefPtr<WebIDBConnectionToServer>> m_webIDBConnectionsByIdentifier;
#endif
};
Modified: releases/WebKitGTK/webkit-2.12/Tools/ChangeLog (197666 => 197667)
--- releases/WebKitGTK/webkit-2.12/Tools/ChangeLog 2016-03-07 09:56:32 UTC (rev 197666)
+++ releases/WebKitGTK/webkit-2.12/Tools/ChangeLog 2016-03-07 09:58:28 UTC (rev 197667)
@@ -1,3 +1,15 @@
+2016-02-29 Brady Eidson <[email protected]>
+
+ Modern IDB: WebKit 2 IPC layer easily confused about multiple web processes being connected.
+ https://bugs.webkit.org/show_bug.cgi?id=154837
+
+ Reviewed by Alex Christensen.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-1.html: Added.
+ * TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-2.html: Added.
+ * TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm: Added.
+
2016-02-25 Sam Weinig <[email protected]>
HashMap::ensure() should return an AddResult like all the other add-like functions
Added: releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-1.html (0 => 197667)
--- releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-1.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-1.html 2016-03-07 09:58:28 UTC (rev 197667)
@@ -0,0 +1,46 @@
+<script>
+
+var request = window.indexedDB.deleteDatabase("IndexedDBMultiProcess");
+request._onsuccess_ = function(e)
+{
+ continueTest();
+}
+request._onerror_ = function(e)
+{
+ // Unexpected error
+ window.webkit.messageHandlers.testHandler.postMessage('Error opening database');
+}
+
+function continueTest()
+{
+ var request = window.indexedDB.open("IndexedDBMultiProcess", 2);
+
+ request._onsuccess_ = function()
+ {
+ window.webkit.messageHandlers.testHandler.postMessage('Success');
+ }
+
+ request._onerror_ = function()
+ {
+ // Unexpected error
+ window.webkit.messageHandlers.testHandler.postMessage('Error');
+ }
+
+ request._onupgradeneeded_ = function(event)
+ {
+ window.webkit.messageHandlers.testHandler.postMessage('UpgradeNeeded');
+
+ var store = event.target.result.createObjectStore("TestObjectStore");
+
+ event.target.transaction._oncomplete_ = function() {
+ window.webkit.messageHandlers.testHandler.postMessage('Transaction complete');
+ }
+
+ event.target.transaction._onerror_ = function() {
+ window.webkit.messageHandlers.testHandler.postMessage('Transaction errored!');
+ }
+
+ store.put("bar", "foo");
+ }
+}
+</script>
Added: releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-2.html (0 => 197667)
--- releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-2.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess-2.html 2016-03-07 09:58:28 UTC (rev 197667)
@@ -0,0 +1,32 @@
+<script>
+
+var request = window.indexedDB.open("IndexedDBMultiProcess", 2);
+
+request._onsuccess_ = function(event)
+{
+ var req = event.target.result.transaction("TestObjectStore").objectStore("TestObjectStore").get("foo");
+
+ req._onsuccess_ = function(event)
+ {
+ window.webkit.messageHandlers.testHandler.postMessage('Value of foo: ' + req.result);
+ }
+
+ req._onerror_ = function(event)
+ {
+ // Unexpected error
+ window.webkit.messageHandlers.testHandler.postMessage('Unexpected error');
+ }
+}
+
+request._onerror_ = function()
+{
+ // Unexpected error
+ window.webkit.messageHandlers.testHandler.postMessage('Unexpected error');
+}
+
+request._onupgradeneeded_ = function(event)
+{
+ // Unexpected upgrade needed
+ window.webkit.messageHandlers.testHandler.postMessage('Unexpected UpgradeNeeded');
+}
+</script>
Added: releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm (0 => 197667)
--- releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm (rev 0)
+++ releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/IndexedDBMultiProcess.mm 2016-03-07 09:58:28 UTC (rev 197667)
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+
+#import "PlatformUtilities.h"
+#import "Test.h"
+#import <WebKit/WebKit.h>
+#import <WebKit/WKProcessPoolPrivate.h>
+#import <WebKit/WKUserContentControllerPrivate.h>
+#import <WebKit/_WKProcessPoolConfiguration.h>
+#import <WebKit/_WKUserStyleSheet.h>
+#import <wtf/RetainPtr.h>
+
+#if WK_API_ENABLED
+
+static bool receivedScriptMessage;
+static RetainPtr<WKScriptMessage> lastScriptMessage;
+
+@interface IndexedDBMPMessageHandler : NSObject <WKScriptMessageHandler>
+@end
+
+@implementation IndexedDBMPMessageHandler
+
+- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message
+{
+ receivedScriptMessage = true;
+ lastScriptMessage = message;
+}
+
+@end
+
+TEST(IndexedDB, IndexedDBMultiProcess)
+{
+ RetainPtr<IndexedDBMPMessageHandler> handler = adoptNS([[IndexedDBMPMessageHandler alloc] init]);
+ RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+ [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
+ [configuration.get().processPool _terminateDatabaseProcess];
+
+ RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+
+ NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"IndexedDBMultiProcess-1" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
+ [webView loadRequest:request];
+
+ TestWebKitAPI::Util::run(&receivedScriptMessage);
+ receivedScriptMessage = false;
+ RetainPtr<NSString> string1 = (NSString *)[lastScriptMessage body];
+
+ TestWebKitAPI::Util::run(&receivedScriptMessage);
+ receivedScriptMessage = false;
+ RetainPtr<NSString> string2 = (NSString *)[lastScriptMessage body];
+
+ // Make a new web view with a new web process to finish the test
+ RetainPtr<WKWebView> webView2 = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
+
+ request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"IndexedDBMultiProcess-2" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
+ [webView2 loadRequest:request];
+
+ TestWebKitAPI::Util::run(&receivedScriptMessage);
+ receivedScriptMessage = false;
+ RetainPtr<NSString> string3 = (NSString *)[lastScriptMessage body];
+
+ EXPECT_WK_STREQ(@"UpgradeNeeded", string1.get());
+ EXPECT_WK_STREQ(@"Transaction complete", string2.get());
+ EXPECT_WK_STREQ(@"Value of foo: bar", string3.get());
+}
+
+#endif
