Changeset 57301 in webkit

Timestamp:

Apr 8, 2010 3:55:12 PM (14 years ago)

Author:

dumi@chromium.org

Message:

WebCore: Create the creation callback is the current world.
​https://bugs.webkit.org/show_bug.cgi?id=37290

Reviewed by Geoffrey Garen.

• bindings/js/JSDatabaseCallback.cpp:

(WebCore::JSDatabaseCallback::JSDatabaseCallback):

LayoutTests: Test that the creation callback is executed in the world where it
was created.
​https://bugs.webkit.org/show_bug.cgi?id=37290

Reviewed by Geoffrey Garen.

• storage/open-database-creation-callback-isolated-world-expected.txt:
• storage/open-database-creation-callback-isolated-world.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/open-database-creation-callback-isolated-world-expected.txt (modified) (1 diff)
• LayoutTests/storage/open-database-creation-callback-isolated-world.html (modified) (3 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/JSDatabaseCallback.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-08  Dumitru Daniliuc  <dumi@chromium.org>
+
+        Reviewed by Geoffrey Garen.
+
+        Test that the creation callback is executed in the world where it
+        was created.
+        https://bugs.webkit.org/show_bug.cgi?id=37290
+
+        * storage/open-database-creation-callback-isolated-world-expected.txt:
+        * storage/open-database-creation-callback-isolated-world.html:
+
 2010-04-08  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/LayoutTests/storage/open-database-creation-callback-isolated-world-expected.txt

@@ -1 +1 @@
 ALERT: undefined
+ALERT: PASS: document.body.bar visible in a callback created in this world.
 This test tests that the openDatabase() creation callback is called in the right world.
 

trunk/LayoutTests/storage/open-database-creation-callback-isolated-world.html

@@ -5 +5 @@
 <div id="console"></div>
 <script>
+var creationCallbacksExecuted = 0;
 function done()
 {
-    if (window.layoutTestController)
+    if ((++creationCallbacksExecuted == 2) && (window.layoutTestController))
         layoutTestController.notifyDone();
 }
 
-function creationCallback(db)
+function creationCallback1(db)
 {
     alert("FAIL: Visible in isolated world.");
@@ -17 +18 @@
 }
 
+function creationCallback2(db)
+{
+    alert(document.body.bar);
+    done();
+}
+
 document.body.foo = "FAIL: document.body.foo visible in isolated world.";
+document.body.bar = "PASS: document.body.bar visible in a callback created in this world.";
 
 if (window.layoutTestController) {
@@ -25 +33 @@
     layoutTestController.evaluateScriptInIsolatedWorld(
         0,
-        "function creationCallback(db)\n" +
+        "function creationCallback1(db)\n" +
         "{\n" +
         "    alert(document.body.foo);\n" +
         "    window.location='javascript:done()';\n" +
         "}\n" +
-        "var db = openDatabase('OpenDatabaseCreationCallbackIsolatedWorld', '1.0', '', 1, creationCallback);");
+        "var db1 = openDatabase('OpenDatabaseCreationCallbackIsolatedWorld', '1.0', '', 1, creationCallback1);");
+
+    var db2 = openDatabase('OpenDatabaseCreationCallbackIsolatedWorld2', '1.0', '', 1, creationCallback2);
 }
 </script>

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-08  Dumitru Daniliuc  <dumi@chromium.org>
+
+        Reviewed by Geoffrey Garen.
+
+        Create the creation callback is the current world.
+        https://bugs.webkit.org/show_bug.cgi?id=37290
+
+        * bindings/js/JSDatabaseCallback.cpp:
+        (WebCore::JSDatabaseCallback::JSDatabaseCallback):
+
 2010-04-08  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/bindings/js/JSDatabaseCallback.cpp

@@ -36 +36 @@
 #include "Frame.h"
 #include "JSDatabase.h"
-#include "ScriptController.h"
 #include "ScriptExecutionContext.h"
 #include <runtime/JSLock.h>
@@ -47 +46 @@
 JSDatabaseCallback::JSDatabaseCallback(JSObject* callback, JSDOMGlobalObject* globalObject)
     : m_data(new JSCallbackData(callback, globalObject))
-    , m_isolatedWorld(DOMWrapperWorld::create(globalObject->globalData(), true))
+    , m_isolatedWorld(globalObject->world())
 {
 }