2011-02-03 Jeremy Orlow <jorlow@chromium.org>

        Reviewed by Nate Chapin.

        Don't clear the callbacks ref in the proxy layer for IndexedDB
        https://bugs.webkit.org/show_bug.cgi?id=53535

        Clearing the callbacks doesn't actually solve any problems and makes
        this code behave subtly differently than how it would in Safari and
        other single process environments. Let's remove the difference.

        * src/IDBCallbacksProxy.cpp:
        (WebCore::IDBCallbacksProxy::onError):
        (WebCore::IDBCallbacksProxy::onSuccess):
        * src/IDBTransactionCallbacksProxy.cpp:
        (WebCore::IDBTransactionCallbacksProxy::onAbort):
        (WebCore::IDBTransactionCallbacksProxy::onComplete):
        (WebCore::IDBTransactionCallbacksProxy::onTimeout):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77572 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index 8c5ed98cffe2b3132bcf26ab59e1a1aba0566d86..80d6715f8699c64ff3dbfdaf7bd81d34561d7bbf 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,22 @@
+2011-02-03  Jeremy Orlow  <jorlow@chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        Don't clear the callbacks ref in the proxy layer for IndexedDB
+        https://bugs.webkit.org/show_bug.cgi?id=53535
+
+        Clearing the callbacks doesn't actually solve any problems and makes
+        this code behave subtly differently than how it would in Safari and
+        other single process environments. Let's remove the difference.
+
+        * src/IDBCallbacksProxy.cpp:
+        (WebCore::IDBCallbacksProxy::onError):
+        (WebCore::IDBCallbacksProxy::onSuccess):
+        * src/IDBTransactionCallbacksProxy.cpp:
+        (WebCore::IDBTransactionCallbacksProxy::onAbort):
+        (WebCore::IDBTransactionCallbacksProxy::onComplete):
+        (WebCore::IDBTransactionCallbacksProxy::onTimeout):
+
 2011-02-03  Hans Wennborg  <hans@chromium.org>
 
         Reviewed by Jeremy Orlow.

diff --git a/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp b/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp
index 691fb75376cbb71a4ed611e00bb2aa0677a2629e..dba28d94eafe63b8809210c68df9cddfc9f22c0d 100644 (file)
--- a/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp
+++ b/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp
@@ -62,49 +62,41 @@ IDBCallbacksProxy::~IDBCallbacksProxy()
 void IDBCallbacksProxy::onError(PassRefPtr<IDBDatabaseError> idbDatabaseError)
 {
     m_callbacks->onError(WebKit::WebIDBDatabaseError(idbDatabaseError));
-    m_callbacks.clear();
 }
 
 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBCursorBackendInterface> idbCursorBackend)
 {
     m_callbacks->onSuccess(new WebKit::WebIDBCursorImpl(idbCursorBackend));
-    m_callbacks.clear();
 }
 
 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> backend)
 {
     m_callbacks->onSuccess(new WebKit::WebIDBDatabaseImpl(backend));
-    m_callbacks.clear();
 }
 
 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBIndexBackendInterface> backend)
 {
     m_callbacks->onSuccess(new WebKit::WebIDBIndexImpl(backend));
-    m_callbacks.clear();
 }
 
 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBKey> idbKey)
 {
     m_callbacks->onSuccess(WebKit::WebIDBKey(idbKey));
-    m_callbacks.clear();
 }
 
 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBObjectStoreBackendInterface> backend)
 {
     m_callbacks->onSuccess(new WebKit::WebIDBObjectStoreImpl(backend));
-    m_callbacks.clear();
 }
 
 void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBTransactionBackendInterface> backend)
 {
     m_callbacks->onSuccess(new WebKit::WebIDBTransactionImpl(backend));
-    m_callbacks.clear();
 }
 
 void IDBCallbacksProxy::onSuccess(PassRefPtr<SerializedScriptValue> serializedScriptValue)
 {
     m_callbacks->onSuccess(WebKit::WebSerializedScriptValue(serializedScriptValue));
-    m_callbacks.clear();
 }
 
 } // namespace WebCore

diff --git a/Source/WebKit/chromium/src/IDBTransactionCallbacksProxy.cpp b/Source/WebKit/chromium/src/IDBTransactionCallbacksProxy.cpp
index 3a19fe2edf68fcf1b9b22f13b9d2ea4950201e3e..e2336f4b2f39e5613edd0634bb410d23a38936a4 100644 (file)
--- a/Source/WebKit/chromium/src/IDBTransactionCallbacksProxy.cpp
+++ b/Source/WebKit/chromium/src/IDBTransactionCallbacksProxy.cpp
@@ -52,19 +52,16 @@ IDBTransactionCallbacksProxy::~IDBTransactionCallbacksProxy()
 void IDBTransactionCallbacksProxy::onAbort()
 {
     m_callbacks->onAbort();
-    m_callbacks.clear();
 }
 
 void IDBTransactionCallbacksProxy::onComplete()
 {
     m_callbacks->onComplete();
-    m_callbacks.clear();
 }
 
 void IDBTransactionCallbacksProxy::onTimeout()
 {
     m_callbacks->onTimeout();
-    m_callbacks.clear();
 }
 
 } // namespace WebCore