Changeset 91309 in webkit

Timestamp:

Jul 19, 2011 3:13:56 PM (13 years ago)

Author:

Nate Chapin

Message:

Source/WebCore: [V8] Wait until no v8 context is on the stack before
cancelling pending indexed db transactions.
​https://bugs.webkit.org/show_bug.cgi?id=64552

Reviewed by Adam Barth.

Test: storage/indexeddb/transaction-abort-with-js-recursion.html

• bindings/v8/V8Proxy.cpp:

(WebCore::V8Proxy::didLeaveScriptContext):

LayoutTests: Test for ​https://bugs.webkit.org/show_bug.cgi?id=64552.

Reviewed by Adam Barth.

• storage/indexeddb/transaction-abort-with-js-recursion-expected.txt: Added.
• storage/indexeddb/transaction-abort-with-js-recursion.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/transaction-abort-with-js-recursion-expected.txt (added)
• LayoutTests/storage/indexeddb/transaction-abort-with-js-recursion.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/v8/V8Proxy.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-07-19  Nate Chapin  <japhet@chromium.org>
+
+        Test for https://bugs.webkit.org/show_bug.cgi?id=64552.
+
+        Reviewed by Adam Barth.
+
+        * storage/indexeddb/transaction-abort-with-js-recursion-expected.txt: Added.
+        * storage/indexeddb/transaction-abort-with-js-recursion.html: Added.
+
 2011-07-19  Mike West  <mkwst@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-19  Nate Chapin  <japhet@chromium.org>
+
+        [V8] Wait until no v8 context is on the stack before
+        cancelling pending indexed db transactions.
+        https://bugs.webkit.org/show_bug.cgi?id=64552
+
+        Reviewed by Adam Barth.
+
+        Test: storage/indexeddb/transaction-abort-with-js-recursion.html
+
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::V8Proxy::didLeaveScriptContext):
+
 2011-07-19  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/bindings/v8/V8Proxy.cpp

@@ -612 +612 @@
     if (!page)
         return;
+    // If we've just left a top level script context and local storage has been
+    // instantiated, we must ensure that any storage locks have been freed.
+    // Per http://dev.w3.org/html5/spec/Overview.html#storage-mutex
+    if (m_recursion)
+        return;
 #if ENABLE(INDEXED_DATABASE)
     // If we've just left a script context and indexed database has been
@@ -618 +623 @@
     IDBPendingTransactionMonitor::abortPendingTransactions();
 #endif // ENABLE(INDEXED_DATABASE)
-    // If we've just left a top level script context and local storage has been
-    // instantiated, we must ensure that any storage locks have been freed.
-    // Per http://dev.w3.org/html5/spec/Overview.html#storage-mutex
-    if (m_recursion != 0)
-        return;
     if (page->group().hasLocalStorage())
         page->group().localStorage()->unlock();