1 files changed, 12 insertions, 2 deletions
diff --git a/WebCore/bindings/v8/ScriptController.h b/WebCore/bindings/v8/ScriptController.h
index a958ead..fb7bbee 100644
--- a/WebCore/bindings/v8/ScriptController.h
+++ b/WebCore/bindings/v8/ScriptController.h
@@ -39,6 +39,7 @@
 #include <v8.h>
 
 #include <wtf/HashMap.h>
+#include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
@@ -47,6 +48,7 @@ namespace WebCore {
     class Frame;
     class HTMLPlugInElement;
     class ScriptSourceCode;
+    class ScriptState;
     class String;
     class Widget;
     class XSSAuditor;
@@ -165,6 +167,13 @@ namespace WebCore {
         NPObject* windowScriptNPObject();
 #endif
 
+        // Dummy method to avoid a bunch of ifdef's in WebCore.
+        void evaluateInWorld(const ScriptSourceCode&, DOMWrapperWorld*) { }
+        static void getAllWorlds(Vector<DOMWrapperWorld*>& worlds);
+
+        // Script state for the main world context.
+        ScriptState* mainWorldScriptState();
+
     private:
         Frame* m_frame;
         const String* m_sourceURL;
@@ -187,9 +196,10 @@ namespace WebCore {
 #endif
         // The XSSAuditor associated with this ScriptController.
         OwnPtr<XSSAuditor> m_XSSAuditor;
-    };
 
-    DOMWrapperWorld* mainThreadNormalWorld();
+        // Script state for the main world context.
+        OwnPtr<ScriptState> m_mainWorldScriptState;
+    };
 
 } // namespace WebCore