Changeset 143403 in webkit

Timestamp:

Feb 19, 2013 4:20:29 PM (11 years ago)

Author:

enne@google.com

Message:

Unreviewed, rolling out r143382 and r143401.
​http://trac.webkit.org/changeset/143382
​http://trac.webkit.org/changeset/143401
​https://bugs.webkit.org/show_bug.cgi?id=106457

Breaks Chromium win/mac canary compilation

Source/Platform:

• chromium/public/Platform.h:

Source/WebKit/chromium:

• public/platform/WebKitPlatformSupport.h:

(WebKit):
(WebKitPlatformSupport):
(WebKit::WebKitPlatformSupport::idbFactory):
(WebKit::WebKitPlatformSupport::~WebKitPlatformSupport):

• src/IDBFactoryBackendProxy.cpp:

(WebKit::IDBFactoryBackendProxy::IDBFactoryBackendProxy):

Location:

trunk/Source

Files:

• Platform/ChangeLog (modified) (1 diff)
• Platform/chromium/public/Platform.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/public/platform/WebKitPlatformSupport.h (modified) (1 diff)
• WebKit/chromium/src/IDBFactoryBackendProxy.cpp (modified) (2 diffs)

trunk/Source/Platform/ChangeLog

@@ +1 @@
+2013-02-19  Adrienne Walker  <enne@chromium.org>
+
+        Unreviewed, rolling out r143382 and r143401.
+        http://trac.webkit.org/changeset/143382
+        http://trac.webkit.org/changeset/143401
+        https://bugs.webkit.org/show_bug.cgi?id=106457
+
+        Breaks Chromium win/mac canary compilation
+
+        * chromium/public/Platform.h:
+
 2013-02-19  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/Platform/chromium/public/Platform.h

@@ -486 +486 @@
 };
 
-class WebKitPlatformSupport : public Platform {
-protected:
-    ~WebKitPlatformSupport() { }
-};
-
 } // namespace WebKit
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2013-02-19  Adrienne Walker  <enne@chromium.org>
+
+        Unreviewed, rolling out r143382 and r143401.
+        http://trac.webkit.org/changeset/143382
+        http://trac.webkit.org/changeset/143401
+        https://bugs.webkit.org/show_bug.cgi?id=106457
+
+        Breaks Chromium win/mac canary compilation
+
+        * public/platform/WebKitPlatformSupport.h:
+        (WebKit):
+        (WebKitPlatformSupport):
+        (WebKit::WebKitPlatformSupport::idbFactory):
+        (WebKit::WebKitPlatformSupport::~WebKitPlatformSupport):
+        * src/IDBFactoryBackendProxy.cpp:
+        (WebKit::IDBFactoryBackendProxy::IDBFactoryBackendProxy):
+
 2013-02-19  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h

@@ -29 +29 @@
  */
 
+#ifndef WebKitPlatformSupport_h
+#define WebKitPlatformSupport_h
+
 #include "../../../../Platform/chromium/public/Platform.h"
+
+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() { }
+};
+
+} // namespace WebKit
+
+#endif

trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp

@@ -54 +54 @@
 #include "WorkerScriptController.h"
 #include "WorkerThread.h"
+#include "platform/WebKitPlatformSupport.h"
 #include <public/WebVector.h>
 
@@ -75 +76 @@
 IDBFactoryBackendProxy::IDBFactoryBackendProxy()
 {
-    ASSERT(s_webIDBFactory);
-    m_webIDBFactory = s_webIDBFactory;
+    if (s_webIDBFactory)
+        m_webIDBFactory = s_webIDBFactory;
+    else
+        m_webIDBFactory = webKitPlatformSupport()->idbFactory();
 }