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):

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 5207d4e..fca6248 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+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>
 
         Add virtual keyword to ~BitmapImage and ~StillImage because ~Image is virtual.

diff --git a/Source/WebCore/bindings/js/ScriptController.cpp b/Source/WebCore/bindings/js/ScriptController.cpp
index 50a8ac5..06c7996 100644 (file)
--- a/Source/WebCore/bindings/js/ScriptController.cpp
+++ b/Source/WebCore/bindings/js/ScriptController.cpp
@@ -336,10 +336,15 @@ void ScriptController::setCaptureCallStackForUncaughtExceptions(bool)
 {
 }
 
-void ScriptController::collectIsolatedContexts(Vector<std::pair<JSC::ExecState*, SecurityOrigin*> >&)
+void ScriptController::collectIsolatedContexts(Vector<std::pair<JSC::ExecState*, SecurityOrigin*> >& result)
 {
-    // FIXME(85709): support isolated contexts inspection for JSC.
+    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
 
 #if ENABLE(NETSCAPE_PLUGIN_API)