Changeset 57275 in webkit

Timestamp:

Apr 8, 2010 7:14:34 AM (14 years ago)

Author:

jorlow@chromium.org

Message:

2010-04-08 Jeremy Orlow <​jorlow@chromium.org>

Reviewed by Yury Semikhatsky.

IDB callbacks should fire asynchronously
​https://bugs.webkit.org/show_bug.cgi?id=37265

Fix the firing behavior of the callbacks to not be synchronous.

There's still a major bug that I'm trying to track down that is keeping
us from testing this stuff. Promise lots of tests ASAP.

• bindings/v8/custom/V8CustomIDBCallbacks.h: (WebCore::V8CustomIDBCallbacks::onSuccessAsync): (WebCore::V8CustomIDBCallbacks::onErrorAsync):
• storage/IDBCallbacks.h: (WebCore::IDBCallbacks::IDBCallbacks): (WebCore::IDBCallbacks::onSuccess): (WebCore::IDBCallbacks::onError): (WebCore::IDBCallbacks::timerFired):
• storage/IndexedDatabaseRequest.cpp:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/custom/V8CustomIDBCallbacks.h (modified) (2 diffs)
• storage/IDBCallbacks.h (modified) (1 diff)
• storage/IndexedDatabaseRequest.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-08  Jeremy Orlow  <jorlow@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        IDB callbacks should fire asynchronously
+        https://bugs.webkit.org/show_bug.cgi?id=37265
+
+        Fix the firing behavior of the callbacks to not be synchronous.
+
+        There's still a major bug that I'm trying to track down that is keeping
+        us from testing this stuff.  Promise lots of tests ASAP.
+
+        * bindings/v8/custom/V8CustomIDBCallbacks.h:
+        (WebCore::V8CustomIDBCallbacks::onSuccessAsync):
+        (WebCore::V8CustomIDBCallbacks::onErrorAsync):
+        * storage/IDBCallbacks.h:
+        (WebCore::IDBCallbacks::IDBCallbacks):
+        (WebCore::IDBCallbacks::onSuccess):
+        (WebCore::IDBCallbacks::onError):
+        (WebCore::IDBCallbacks::timerFired):
+        * storage/IndexedDatabaseRequest.cpp:
+
 2010-04-08  Kent Tamura  <tkent@chromium.org>
 

trunk/WebCore/bindings/v8/custom/V8CustomIDBCallbacks.h

@@ -62 +62 @@
     }
 
-    virtual void onSuccess(PassRefPtr<ResultType> result)
-    {
-        onEvent(m_onSuccess, ResultWrapperType::create(result));
-    }
-
-    virtual void onError(PassRefPtr<IDBDatabaseError> error)
-    {
-        onEvent(m_onError, error);
-    }
-
     // FIXME: Handle suspend/resume correctly.
 
@@ -110 +100 @@
     }
 
+    virtual void onSuccessAsync(PassRefPtr<ResultType> result)
+    {
+        onEvent(m_onSuccess, ResultWrapperType::create(result));
+    }
+
+    virtual void onErrorAsync(PassRefPtr<IDBDatabaseError> error)
+    {
+        onEvent(m_onError, error);
+    }
+
     // FIXME: Use OwnHandles.
     v8::Persistent<v8::Object> m_onSuccess;

trunk/WebCore/storage/IDBCallbacks.h

@@ -31 +31 @@
 
 #include "ActiveDOMObject.h"
+#include "IDBDatabaseError.h"
+#include "Timer.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
+#if ENABLE(INDEXED_DATABASE)
+
 namespace WebCore {
 
-class IDBDatabaseError;
-
+// All IndexedDB callbacks must implement this class.  It handles the asynchronous firing of
+// the callbacks.
 template <typename ResultType>
 class IDBCallbacks : public RefCounted<IDBCallbacks<ResultType> >, public ActiveDOMObject {
 public:
     IDBCallbacks(ScriptExecutionContext* scriptExecutionContext, void* upcastPointer)
-        : ActiveDOMObject(scriptExecutionContext, upcastPointer) { }
+        : ActiveDOMObject(scriptExecutionContext, upcastPointer)
+        , m_timer(this, &IDBCallbacks::timerFired)
+    {
+    }
+
     virtual ~IDBCallbacks() { }
 
-    virtual void onSuccess(PassRefPtr<ResultType>) = 0;
-    virtual void onError(PassRefPtr<IDBDatabaseError>) = 0;
+    void onSuccess(PassRefPtr<ResultType> result)
+    {
+        ASSERT(!m_result);
+        ASSERT(!m_error);
+        m_result = result;
+        ASSERT(m_result);
+
+        ASSERT(!m_timer.isActive());
+        m_selfRef = this;
+        m_timer.startOneShot(0);
+    }
+
+    void onError(PassRefPtr<IDBDatabaseError> error)
+    {
+        ASSERT(!m_result);
+        ASSERT(!m_error);
+        m_error = error;
+        ASSERT(m_error);
+
+        ASSERT(!m_timer.isActive());
+        m_selfRef = this;
+        m_timer.startOneShot(0);
+    }
+
+protected:
+    virtual void onSuccessAsync(PassRefPtr<ResultType>) = 0;
+    virtual void onErrorAsync(PassRefPtr<IDBDatabaseError>) = 0;
+
+    void timerFired(Timer<IDBCallbacks>*)
+    {
+        if (m_result) {
+            onSuccessAsync(m_result);
+            m_result = 0;
+        } else {
+            onErrorAsync(m_error);
+            m_error = 0;
+        }
+        m_selfRef = 0; // May trigger a delete immediately.
+    }
+
+private:
+    Timer<IDBCallbacks> m_timer;
+    RefPtr<IDBCallbacks> m_selfRef;
+    RefPtr<ResultType> m_result;
+    RefPtr<IDBDatabaseError> m_error;
 };
 
 } // namespace WebCore
 
+#endif
+
 #endif // IDBCallbacks_h
-

trunk/WebCore/storage/IndexedDatabaseRequest.cpp

@@ -31 +31 @@
 
 #include "ExceptionCode.h"
+#include "IDBDatabase.h"
 #include "IndexedDatabase.h"