Title: [141900] trunk/Source/WebKit/chromium
Revision
141900
Author
[email protected]
Date
2013-02-05 10:30:44 -0800 (Tue, 05 Feb 2013)

Log Message

Unreviewed, rolling out r141896.
http://trac.webkit.org/changeset/141896
https://bugs.webkit.org/show_bug.cgi?id=108956

crashes indexdb security tests (Requested by gavinp on
#webkit).

Patch by Sheriff Bot <[email protected]> on 2013-02-05

* public/platform/WebKitPlatformSupport.h:
(WebKit):
(WebKitPlatformSupport):
(WebKit::WebKitPlatformSupport::idbFactory):
* src/IDBFactoryBackendProxy.cpp:
(WebKit::IDBFactoryBackendProxy::IDBFactoryBackendProxy):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (141899 => 141900)


--- trunk/Source/WebKit/chromium/ChangeLog	2013-02-05 18:07:37 UTC (rev 141899)
+++ trunk/Source/WebKit/chromium/ChangeLog	2013-02-05 18:30:44 UTC (rev 141900)
@@ -1,3 +1,19 @@
+2013-02-05  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r141896.
+        http://trac.webkit.org/changeset/141896
+        https://bugs.webkit.org/show_bug.cgi?id=108956
+
+        crashes indexdb security tests (Requested by gavinp on
+        #webkit).
+
+        * public/platform/WebKitPlatformSupport.h:
+        (WebKit):
+        (WebKitPlatformSupport):
+        (WebKit::WebKitPlatformSupport::idbFactory):
+        * src/IDBFactoryBackendProxy.cpp:
+        (WebKit::IDBFactoryBackendProxy::IDBFactoryBackendProxy):
+
 2013-02-05  Mark Pilgrim  <[email protected]>
 
         [Chromium] Remove idbFactory from WebKitPlatformSupport

Modified: trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h (141899 => 141900)


--- trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h	2013-02-05 18:07:37 UTC (rev 141899)
+++ trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h	2013-02-05 18:30:44 UTC (rev 141900)
@@ -35,7 +35,15 @@
 
 namespace WebKit {
 
+class WebIDBFactory; // FIXME: Does this belong in platform?
+
+// FIXME: Eventually all these API will need to move to WebKit::Platform.
 class WebKitPlatformSupport : public Platform {
+public:
+    // Indexed Database ----------------------------------------------------
+
+    virtual WebIDBFactory* idbFactory() { return 0; }
+
 protected:
     ~WebKitPlatformSupport() { }
 };

Modified: trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp (141899 => 141900)


--- trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp	2013-02-05 18:07:37 UTC (rev 141899)
+++ trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp	2013-02-05 18:30:44 UTC (rev 141900)
@@ -53,6 +53,7 @@
 #include "WorkerLoaderProxy.h"
 #include "WorkerScriptController.h"
 #include "WorkerThread.h"
+#include "platform/WebKitPlatformSupport.h"
 #include <public/WebVector.h>
 
 
@@ -74,8 +75,10 @@
 
 IDBFactoryBackendProxy::IDBFactoryBackendProxy()
 {
-    ASSERT(s_webIDBFactory);
-    m_webIDBFactory = s_webIDBFactory;
+    if (s_webIDBFactory)
+        m_webIDBFactory = s_webIDBFactory;
+    else
+        m_webIDBFactory = webKitPlatformSupport()->idbFactory();
 }
 
 IDBFactoryBackendProxy::~IDBFactoryBackendProxy()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to