Modified: trunk/Source/WebKit/chromium/ChangeLog (127902 => 127903)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-07 18:51:37 UTC (rev 127902)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-07 19:04:23 UTC (rev 127903)
@@ -1,3 +1,21 @@
+2012-09-07 Joshua Bell <jsb...@chromium.org>
+
+ [Chromium] IndexedDB: public WebKit API changes for consolidating two-phase connect
+ https://bugs.webkit.org/show_bug.cgi?id=96122
+
+ Reviewed by Adam Barth.
+
+ Prep work for landing Chromium side of http://webkit.org/b/90411 - the IDBFactory
+ open() method now takes the "database callbacks", rather than being sent through
+ in a later call.
+
+ Also, delete an obsolete method.
+
+ * public/WebIDBFactory.h:
+ (WebKit):
+ (WebIDBFactory): Delete pre-version overload of open().
+ (WebKit::WebIDBFactory::open): Add overload that takes WebIDBDatabaseCallbacks.
+
2012-09-07 Sami Kyostila <skyos...@google.com>
[Chromium] GraphicsLayerChromiumTest::applyScrollToScrollableArea() is failing
Modified: trunk/Source/WebKit/chromium/public/WebIDBFactory.h (127902 => 127903)
--- trunk/Source/WebKit/chromium/public/WebIDBFactory.h 2012-09-07 18:51:37 UTC (rev 127902)
+++ trunk/Source/WebKit/chromium/public/WebIDBFactory.h 2012-09-07 19:04:23 UTC (rev 127903)
@@ -41,6 +41,7 @@
class WebFrame;
class WebIDBDatabase;
+class WebIDBDatabaseCallbacks;
class WebSecurityOrigin;
// The entry point into the IndexedDatabase API. These classes match their Foo and
@@ -54,16 +55,13 @@
virtual void getDatabaseNames(WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
- // FIXME: Delete this method when derived classes in chromium have
- // implemented the other open method.
- virtual void open(const WebString& name, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir)
- {
- open(name, WebIDBMetadata::NoIntVersion, callbacks, origin, frame, dataDir);
- }
-
+ // FIXME: This overload should be removed when WK90411 lands.
// The WebKit implementation of open ignores the WebFrame* parameter.
virtual void open(const WebString& name, long long version, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
+ // The WebKit implementation of open ignores the WebFrame* parameter.
+ virtual void open(const WebString& name, long long version, WebIDBCallbacks* callbacks, WebIDBDatabaseCallbacks* databaseCallbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
+
virtual void deleteDatabase(const WebString& name, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
};
