Changeset 51538 in webkit

Timestamp:

Dec 1, 2009, 8:17:42 AM (16 years ago)

Author:

yurys@chromium.org

Message:

2009-12-01 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Adam Barth.

Provide a way to get ScriptState for the inspected page.

​https://bugs.webkit.org/show_bug.cgi?id=32020

• bindings/v8/ScriptController.cpp: (WebCore::ScriptController::mainWorldScriptState):
• bindings/v8/ScriptController.h:
• bindings/v8/ScriptState.cpp: (WebCore::scriptStateFromPage):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/ScriptController.cpp (modified) (2 diffs)
• bindings/v8/ScriptController.h (modified) (3 diffs)
• bindings/v8/ScriptState.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-01  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Provide a way to get ScriptState for the inspected page.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32020
+
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::mainWorldScriptState):
+        * bindings/v8/ScriptController.h:
+        * bindings/v8/ScriptState.cpp:
+        (WebCore::scriptStateFromPage):
+
 2009-12-01  Chris Marrin  <cmarrin@apple.com>
 

trunk/WebCore/bindings/v8/ScriptController.cpp

@@ -48 +48 @@
 #include "NPV8Object.h"
 #include "ScriptSourceCode.h"
+#include "ScriptState.h"
 #include "Settings.h"
 #include "V8Binding.h"
@@ -355 +356 @@
 }
 
+ScriptState* ScriptController::mainWorldScriptState()
+{
+    if (!m_mainWorldScriptState)
+        m_mainWorldScriptState.set(new ScriptState(m_frame, V8Proxy::mainWorldContext(m_frame)));
+    return m_mainWorldScriptState.get();
+}
+
 static NPObject* createNoScriptObject()
 {

trunk/WebCore/bindings/v8/ScriptController.h

@@ -49 +49 @@
     class HTMLPlugInElement;
     class ScriptSourceCode;
+    class ScriptState;
     class String;
     class Widget;
@@ -171 +172 @@
         static void getAllWorlds(Vector<DOMWrapperWorld*>& worlds);
 
+        // Script state for the main world context.
+        ScriptState* mainWorldScriptState();
+
     private:
         Frame* m_frame;
@@ -193 +197 @@
         // The XSSAuditor associated with this ScriptController.
         OwnPtr<XSSAuditor> m_XSSAuditor;
+
+        // Script state for the main world context.
+        OwnPtr<ScriptState> m_mainWorldScriptState;
     };
 

trunk/WebCore/bindings/v8/ScriptState.cpp

@@ -69 +69 @@
 ScriptState* scriptStateFromPage(DOMWrapperWorld*, Page* page)
 {
-    // This should be never reached with V8 bindings.
-    ASSERT_NOT_REACHED();
-    return 0;
+    // This should be only reached with V8 bindings from single process layout tests.
+    return page->mainFrame()->script()->mainWorldScriptState();
 }