Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (123709 => 123710)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-26 06:30:50 UTC (rev 123709)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-26 06:37:34 UTC (rev 123710)
@@ -1,3 +1,26 @@
+2012-07-25 David Grogan <dgro...@chromium.org>
+
+ IndexedDB: WebKit API interfaces for "upgradeneeded" methods and events
+ https://bugs.webkit.org/show_bug.cgi?id=92203
+
+ Reviewed by Adam Barth.
+
+ This is the beginning of our typical three-sided-patch process.
+
+ * public/WebIDBCallbacks.h:
+ (WebKit::WebIDBCallbacks::onBlocked):
+ (WebKit::WebIDBCallbacks::onUpgradeNeeded):
+ * public/WebIDBDatabaseCallbacks.h:
+ (WebKit::WebIDBDatabaseCallbacks::onVersionChange):
+ * public/WebIDBFactory.h:
+ (WebIDBFactory):
+ (WebKit::WebIDBFactory::open):
+ * src/WebIDBFactoryImpl.cpp:
+ (WebKit::WebIDBFactoryImpl::open):
+ (WebKit):
+ * src/WebIDBFactoryImpl.h:
+ (WebIDBFactoryImpl):
+
2012-07-19 Adrienne Walker <e...@google.com>
[chromium] Make all compositor screen space transforms operate on content rects
Modified: trunk/Source/WebKit/chromium/public/WebIDBCallbacks.h (123709 => 123710)
--- trunk/Source/WebKit/chromium/public/WebIDBCallbacks.h 2012-07-26 06:30:50 UTC (rev 123709)
+++ trunk/Source/WebKit/chromium/public/WebIDBCallbacks.h 2012-07-26 06:37:34 UTC (rev 123710)
@@ -58,7 +58,9 @@
virtual void onSuccess(const WebSerializedScriptValue&, const WebIDBKey&, const WebIDBKeyPath&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void onSuccessWithContinuation() { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void onBlocked() { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void onBlocked(long long oldVersion) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void onSuccessWithPrefetch(const WebVector<WebIDBKey>& keys, const WebVector<WebIDBKey>& primaryKeys, const WebVector<WebSerializedScriptValue>& values) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void onUpgradeNeeded(long long oldVersion, WebIDBTransaction*, WebIDBDatabase*) { WEBKIT_ASSERT_NOT_REACHED(); }
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h (123709 => 123710)
--- trunk/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h 2012-07-26 06:30:50 UTC (rev 123709)
+++ trunk/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h 2012-07-26 06:37:34 UTC (rev 123710)
@@ -35,6 +35,7 @@
public:
virtual ~WebIDBDatabaseCallbacks() { }
+ virtual void onVersionChange(long long oldVersion, long long newVersion) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void onVersionChange(const WebString& requestedVersion) { WEBKIT_ASSERT_NOT_REACHED(); }
};
Modified: trunk/Source/WebKit/chromium/public/WebIDBFactory.h (123709 => 123710)
--- trunk/Source/WebKit/chromium/public/WebIDBFactory.h 2012-07-26 06:30:50 UTC (rev 123709)
+++ trunk/Source/WebKit/chromium/public/WebIDBFactory.h 2012-07-26 06:37:34 UTC (rev 123710)
@@ -31,6 +31,7 @@
#include "WebDOMStringList.h"
#include "WebIDBCallbacks.h"
+#include "WebIDBMetadata.h"
#include "WebSecurityOrigin.h"
#include "platform/WebCommon.h"
#include "platform/WebString.h"
@@ -53,8 +54,15 @@
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);
+ }
+
// The WebKit implementation of open ignores the WebFrame* parameter.
- virtual void open(const WebString& name, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame* frame, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
+ virtual void open(const WebString& name, long long version, WebIDBCallbacks* callbacks, 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(); }
};
Modified: trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.cpp (123709 => 123710)
--- trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.cpp 2012-07-26 06:30:50 UTC (rev 123709)
+++ trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.cpp 2012-07-26 06:37:34 UTC (rev 123710)
@@ -69,6 +69,13 @@
m_idbFactoryBackend->open(name, IDBCallbacksProxy::create(adoptPtr(callbacks)).get(), origin, 0, dataDir);
}
+void WebIDBFactoryImpl::open(const WebString& name, long long version, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame*, const WebString& dataDir)
+{
+ // FIXME: Pass version along when WebCore::IDBFactoryBackendInterface
+ // has an open method that accepts it.
+ m_idbFactoryBackend->open(name, IDBCallbacksProxy::create(adoptPtr(callbacks)).get(), origin, 0, dataDir);
+}
+
void WebIDBFactoryImpl::deleteDatabase(const WebString& name, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame*, const WebString& dataDir)
{
m_idbFactoryBackend->deleteDatabase(name, IDBCallbacksProxy::create(adoptPtr(callbacks)), origin, 0, dataDir);
Modified: trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.h (123709 => 123710)
--- trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.h 2012-07-26 06:30:50 UTC (rev 123709)
+++ trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.h 2012-07-26 06:37:34 UTC (rev 123710)
@@ -46,6 +46,7 @@
virtual void getDatabaseNames(WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir);
virtual void open(const WebString& name, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir);
+ virtual void open(const WebString& name, long long version, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir);
virtual void deleteDatabase(const WebString& name, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir);
private:
