Merge WebKit at r70209: Initial merge by Git

Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e

1 files changed, 38 insertions, 0 deletions

diff --git a/WebKit/win/WebDatabaseManager.cpp b/WebKit/win/WebDatabaseManager.cpp
index 4c23d6c..bdcb549 100644
--- a/WebKit/win/WebDatabaseManager.cpp
+++ b/WebKit/win/WebDatabaseManager.cpp
@@ -38,6 +38,7 @@
 #include "WebNotificationCenter.h"
 #include "WebSecurityOrigin.h"
 
+#include <JavaScriptCore/MainThread.h>
 #include <WebCore/BString.h>
 #include <WebCore/COMPtr.h>
 #include <WebCore/DatabaseTracker.h>
@@ -327,8 +328,40 @@ HRESULT STDMETHODCALLTYPE WebDatabaseManager::deleteDatabase(
     return S_OK;
 }
 
+class DidModifyOriginData : public Noncopyable {
+public:
+    static void dispatchToMainThread(WebDatabaseManager* databaseManager, SecurityOrigin* origin)
+    {
+        DidModifyOriginData* context = new DidModifyOriginData(databaseManager, origin->threadsafeCopy());
+        callOnMainThread(&DidModifyOriginData::dispatchDidModifyOriginOnMainThread, context);
+    }
+
+private:
+    DidModifyOriginData(WebDatabaseManager* databaseManager, PassRefPtr<SecurityOrigin> origin)
+        : databaseManager(databaseManager)
+        , origin(origin)
+    {
+    }
+
+    static void dispatchDidModifyOriginOnMainThread(void* context)
+    {
+        ASSERT(isMainThread());
+        DidModifyOriginData* info = static_cast<DidModifyOriginData*>(context);
+        info->databaseManager->dispatchDidModifyOrigin(info->origin.get());
+        delete info;
+    }
+
+    WebDatabaseManager* databaseManager;
+    RefPtr<SecurityOrigin> origin;
+};
+
 void WebDatabaseManager::dispatchDidModifyOrigin(SecurityOrigin* origin)
 {
+    if (!isMainThread()) {
+        DidModifyOriginData::dispatchToMainThread(this, origin);
+        return;
+    }
+
     static BSTR databaseDidModifyOriginName = SysAllocString(WebDatabaseDidModifyOriginNotification);
     IWebNotificationCenter* notifyCenter = WebNotificationCenter::defaultCenterInternal();
 
@@ -353,6 +386,11 @@ HRESULT STDMETHODCALLTYPE WebDatabaseManager::setQuota(
 
 void WebDatabaseManager::dispatchDidModifyDatabase(SecurityOrigin* origin, const String& databaseName)
 {
+    if (!isMainThread()) {
+        DidModifyOriginData::dispatchToMainThread(this, origin);
+        return;
+    }
+
     static BSTR databaseDidModifyOriginName = SysAllocString(WebDatabaseDidModifyDatabaseNotification);
     IWebNotificationCenter* notifyCenter = WebNotificationCenter::defaultCenterInternal();