Changeset 121891 in webkit

Timestamp:

Jul 5, 2012 1:19:51 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: [JSC] support JS execution in the context of an isolated world
​https://bugs.webkit.org/show_bug.cgi?id=85709

Patch by Peter Wang <​peter.wang@torchmobile.com.cn> on 2012-07-05
Reviewed by Gavin Barraclough.

No new test case for this bug.

• bindings/js/ScriptController.cpp:

(WebCore::ScriptController::collectIsolatedContexts):
(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/ScriptController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-05  Peter Wang  <peter.wang@torchmobile.com.cn>
+
+        Web Inspector: [JSC] support JS execution in the context of an isolated world
+        https://bugs.webkit.org/show_bug.cgi?id=85709
+
+        Reviewed by Gavin Barraclough.
+
+        No new test case for this bug. 
+
+        * bindings/js/ScriptController.cpp:
+        (WebCore::ScriptController::collectIsolatedContexts):
+        (WebCore):
+
 2012-07-04  Huang Dongsung  <luxtella@company100.net>
 

trunk/Source/WebCore/bindings/js/ScriptController.cpp

@@ -337 +337 @@
 }
 
-void ScriptController::collectIsolatedContexts(Vector<std::pair<JSC::ExecState*, SecurityOrigin*> >&)
-{
-    // FIXME(85709): support isolated contexts inspection for JSC.
-}
+void ScriptController::collectIsolatedContexts(Vector<std::pair<JSC::ExecState*, SecurityOrigin*> >& result)
+{
+    for (ShellMap::iterator iter = m_windowShells.begin(); iter != m_windowShells.end(); ++iter) {
+        JSC::ExecState* exec = iter->second->window()->globalExec();
+        SecurityOrigin* origin = iter->second->window()->impl()->securityOrigin();
+        result.append(std::pair<ScriptState*, SecurityOrigin*>(exec, origin));
+    }
+}
+
 #endif