Title: [143403] trunk/Source
- Revision
- 143403
- Author
- e...@google.com
- Date
- 2013-02-19 16:20:29 -0800 (Tue, 19 Feb 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/Platform/ChangeLog (143402 => 143403)
--- trunk/Source/Platform/ChangeLog 2013-02-20 00:15:23 UTC (rev 143402)
+++ trunk/Source/Platform/ChangeLog 2013-02-20 00:20:29 UTC (rev 143403)
@@ -1,3 +1,14 @@
+2013-02-19 Adrienne Walker <e...@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 <pilg...@chromium.org>
[Chromium] Move WebKitPlatformSupport declaration to Platform.h
Modified: trunk/Source/Platform/chromium/public/Platform.h (143402 => 143403)
--- trunk/Source/Platform/chromium/public/Platform.h 2013-02-20 00:15:23 UTC (rev 143402)
+++ trunk/Source/Platform/chromium/public/Platform.h 2013-02-20 00:20:29 UTC (rev 143403)
@@ -485,11 +485,6 @@
virtual ~Platform() { }
};
-class WebKitPlatformSupport : public Platform {
-protected:
- ~WebKitPlatformSupport() { }
-};
-
} // namespace WebKit
#endif
Modified: trunk/Source/WebKit/chromium/ChangeLog (143402 => 143403)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-02-20 00:15:23 UTC (rev 143402)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-02-20 00:20:29 UTC (rev 143403)
@@ -1,3 +1,20 @@
+2013-02-19 Adrienne Walker <e...@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 <pilg...@chromium.org>
[Chromium] Move WebKitPlatformSupport declaration to Platform.h
Modified: trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h (143402 => 143403)
--- trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h 2013-02-20 00:15:23 UTC (rev 143402)
+++ trunk/Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h 2013-02-20 00:20:29 UTC (rev 143403)
@@ -28,4 +28,26 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#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
Modified: trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp (143402 => 143403)
--- trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp 2013-02-20 00:15:23 UTC (rev 143402)
+++ trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp 2013-02-20 00:20:29 UTC (rev 143403)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
