Title: [121891] trunk/Source/WebCore
- Revision
- 121891
- Author
- [email protected]
- Date
- 2012-07-05 01:19:51 -0700 (Thu, 05 Jul 2012)
Log 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 <[email protected]> on 2012-07-05
Reviewed by Gavin Barraclough.
No new test case for this bug.
* bindings/js/ScriptController.cpp:
(WebCore::ScriptController::collectIsolatedContexts):
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121890 => 121891)
--- trunk/Source/WebCore/ChangeLog 2012-07-05 08:14:58 UTC (rev 121890)
+++ trunk/Source/WebCore/ChangeLog 2012-07-05 08:19:51 UTC (rev 121891)
@@ -1,3 +1,16 @@
+2012-07-05 Peter Wang <[email protected]>
+
+ 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 <[email protected]>
Add virtual keyword to ~BitmapImage and ~StillImage because ~Image is virtual.
Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (121890 => 121891)
--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2012-07-05 08:14:58 UTC (rev 121890)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2012-07-05 08:19:51 UTC (rev 121891)
@@ -336,10 +336,15 @@
{
}
-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)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
