- Revision
- 121185
- Author
- [email protected]
- Date
- 2012-06-25 15:09:36 -0700 (Mon, 25 Jun 2012)
Log Message
IndexedDB: Stub out new onSuccess() handler for chromium
https://bugs.webkit.org/show_bug.cgi?id=89895
This is the chromium side of a refactor which will
introduce an onSuccess() method which includes the raw
SerializedScriptValue to the frontend, so the primaryKey
injection can happen in the front end, rather than
the V8 helper process.
Patch by Alec Flett <[email protected]> on 2012-06-25
Reviewed by Darin Fisher.
* public/WebIDBCallbacks.h:
(WebKit):
(WebKit::WebIDBCallbacks::onSuccess):
* src/IDBCallbacksProxy.cpp:
(WebKit::IDBCallbacksProxy::onSuccess):
* src/IDBCallbacksProxy.h:
(IDBCallbacksProxy):
* src/WebIDBCallbacksImpl.cpp:
(WebKit::WebIDBCallbacksImpl::onSuccess):
(WebKit):
* src/WebIDBCallbacksImpl.h:
(WebIDBCallbacksImpl):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (121184 => 121185)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-25 22:01:23 UTC (rev 121184)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-25 22:09:36 UTC (rev 121185)
@@ -1,3 +1,29 @@
+2012-06-25 Alec Flett <[email protected]>
+
+ IndexedDB: Stub out new onSuccess() handler for chromium
+ https://bugs.webkit.org/show_bug.cgi?id=89895
+
+ This is the chromium side of a refactor which will
+ introduce an onSuccess() method which includes the raw
+ SerializedScriptValue to the frontend, so the primaryKey
+ injection can happen in the front end, rather than
+ the V8 helper process.
+
+ Reviewed by Darin Fisher.
+
+ * public/WebIDBCallbacks.h:
+ (WebKit):
+ (WebKit::WebIDBCallbacks::onSuccess):
+ * src/IDBCallbacksProxy.cpp:
+ (WebKit::IDBCallbacksProxy::onSuccess):
+ * src/IDBCallbacksProxy.h:
+ (IDBCallbacksProxy):
+ * src/WebIDBCallbacksImpl.cpp:
+ (WebKit::WebIDBCallbacksImpl::onSuccess):
+ (WebKit):
+ * src/WebIDBCallbacksImpl.h:
+ (WebIDBCallbacksImpl):
+
2012-06-25 Joshua Bell <[email protected]>
IndexedDB: Remove unused backend property accessors
Modified: trunk/Source/WebKit/chromium/public/WebIDBCallbacks.h (121184 => 121185)
--- trunk/Source/WebKit/chromium/public/WebIDBCallbacks.h 2012-06-25 22:01:23 UTC (rev 121184)
+++ trunk/Source/WebKit/chromium/public/WebIDBCallbacks.h 2012-06-25 22:09:36 UTC (rev 121185)
@@ -36,6 +36,7 @@
class WebIDBDatabase;
class WebIDBDatabaseError;
class WebIDBKey;
+class WebIDBKeyPath;
class WebIDBIndex;
class WebIDBObjectStore;
class WebIDBTransaction;
@@ -54,6 +55,7 @@
virtual void onSuccess(const WebIDBKey&) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void onSuccess(WebIDBTransaction*) { WEBKIT_ASSERT_NOT_REACHED(); }
virtual void onSuccess(const WebSerializedScriptValue&) { WEBKIT_ASSERT_NOT_REACHED(); }
+ 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 onSuccessWithPrefetch(const WebVector<WebIDBKey>& keys, const WebVector<WebIDBKey>& primaryKeys, const WebVector<WebSerializedScriptValue>& values) { WEBKIT_ASSERT_NOT_REACHED(); }
Modified: trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp (121184 => 121185)
--- trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp 2012-06-25 22:01:23 UTC (rev 121184)
+++ trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp 2012-06-25 22:09:36 UTC (rev 121185)
@@ -94,6 +94,10 @@
m_callbacks->onSuccess(WebSerializedScriptValue(serializedScriptValue));
}
+void IDBCallbacksProxy::onSuccess(PassRefPtr<SerializedScriptValue> serializedScriptValue, PassRefPtr<IDBKey> key, const IDBKeyPath& keyPath)
+{
+ m_callbacks->onSuccess(serializedScriptValue, key, keyPath);
+}
void IDBCallbacksProxy::onSuccessWithContinuation()
{
m_callbacks->onSuccessWithContinuation();
Modified: trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.h (121184 => 121185)
--- trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.h 2012-06-25 22:01:23 UTC (rev 121184)
+++ trunk/Source/WebKit/chromium/src/IDBCallbacksProxy.h 2012-06-25 22:09:36 UTC (rev 121185)
@@ -52,6 +52,7 @@
virtual void onSuccess(PassRefPtr<WebCore::IDBKey>);
virtual void onSuccess(PassRefPtr<WebCore::IDBTransactionBackendInterface>);
virtual void onSuccess(PassRefPtr<WebCore::SerializedScriptValue>);
+ virtual void onSuccess(PassRefPtr<WebCore::SerializedScriptValue>, PassRefPtr<WebCore::IDBKey>, const WebCore::IDBKeyPath&);
virtual void onSuccessWithContinuation();
virtual void onSuccessWithPrefetch(const Vector<RefPtr<WebCore::IDBKey> >& keys, const Vector<RefPtr<WebCore::IDBKey> >& primaryKeys, const Vector<RefPtr<WebCore::SerializedScriptValue> >& values);
virtual void onBlocked();
Modified: trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp (121184 => 121185)
--- trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp 2012-06-25 22:01:23 UTC (rev 121184)
+++ trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp 2012-06-25 22:09:36 UTC (rev 121185)
@@ -90,6 +90,13 @@
m_callbacks->onSuccess(serializedScriptValue);
}
+void WebIDBCallbacksImpl::onSuccess(const WebSerializedScriptValue& serializedScriptValue, const WebIDBKey& key, const WebIDBKeyPath& keyPath)
+{
+ // FIXME: proxy to the 3-parameter version when interface lands:
+ // m_callbacks->onSuccess(serializedScriptValue, key, keyPath););
+ ASSERT_NOT_REACHED();
+}
+
void WebIDBCallbacksImpl::onSuccessWithContinuation()
{
m_callbacks->onSuccessWithContinuation();
Modified: trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.h (121184 => 121185)
--- trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.h 2012-06-25 22:01:23 UTC (rev 121184)
+++ trunk/Source/WebKit/chromium/src/WebIDBCallbacksImpl.h 2012-06-25 22:09:36 UTC (rev 121185)
@@ -48,6 +48,7 @@
virtual void onSuccess(const WebIDBKey&);
virtual void onSuccess(WebIDBTransaction*);
virtual void onSuccess(const WebSerializedScriptValue&);
+ virtual void onSuccess(const WebSerializedScriptValue&, const WebIDBKey&, const WebIDBKeyPath&);
virtual void onSuccessWithContinuation();
virtual void onBlocked();
