2007-10-25 Eric Seidel <eric@webkit.org>

        Reviewed by Geoff.

        Make JSG build again after JSGlobalObject change.

        * JSRun.cpp:
        (JSRun::JSRun):
        (JSRun::GlobalObject):
        * JSRun.h:
        (JSInterpreter::JSInterpreter):
        * JSUtils.h:

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

diff --git a/JavaScriptGlue/ChangeLog b/JavaScriptGlue/ChangeLog
index 1b84d9f7309ca0f35a2ac33eb3ce7dd0199e69fb..c1ac64dbb84db7245e299d1bb4bccd935256394e 100644 (file)
--- a/JavaScriptGlue/ChangeLog
+++ b/JavaScriptGlue/ChangeLog
@@ -1,3 +1,16 @@
+2007-10-25  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Geoff.
+        
+        Make JSG build again after JSGlobalObject change.
+
+        * JSRun.cpp:
+        (JSRun::JSRun):
+        (JSRun::GlobalObject):
+        * JSRun.h:
+        (JSInterpreter::JSInterpreter):
+        * JSUtils.h:
+
 2007-10-11  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Tim Hatcher.

diff --git a/JavaScriptGlue/JSRun.cpp b/JavaScriptGlue/JSRun.cpp
index d7e69cc529657ca11793dd02cd1446cbceef6e77..fae35e4d7f87740c5bede8f66cc0bbe758ab3b19 100644 (file)
--- a/JavaScriptGlue/JSRun.cpp
+++ b/JavaScriptGlue/JSRun.cpp
@@ -32,7 +32,7 @@
 JSRun::JSRun(CFStringRef source, JSFlags inFlags)
     :   JSBase(kJSRunTypeID),
         fSource(CFStringToUString(source)),
-        fGlobalObject(new JSObject()),
+        fGlobalObject(new JSGlobalObject()),
         fInterpreter(new JSInterpreter(fGlobalObject, inFlags)),
         fFlags(inFlags)
 {
@@ -52,7 +52,7 @@ UString JSRun::GetSource() const
     return fSource;
 }
 
-JSObject *JSRun::GlobalObject() const
+JSGlobalObject* JSRun::GlobalObject() const
 {
     return fGlobalObject;
 }

diff --git a/JavaScriptGlue/JSRun.h b/JavaScriptGlue/JSRun.h
index def0835316a89c999d0231c370a54fec5427269c..45cb9107db3aa38462bbc6c0ad8aad48d4a716ef 100644 (file)
--- a/JavaScriptGlue/JSRun.h
+++ b/JavaScriptGlue/JSRun.h
@@ -34,8 +34,8 @@
 
 class JSInterpreter : public Interpreter {
     public:
-        JSInterpreter(JSObject *global, JSFlags flags) : Interpreter(global), fJSFlags(flags) { }
-        JSInterpreter(JSObject *global) : Interpreter(global), fJSFlags(kJSFlagNone) { }
+        JSInterpreter(JSGlobalObject *global, JSFlags flags) : Interpreter(global), fJSFlags(flags) { }
+        JSInterpreter(JSGlobalObject *global) : Interpreter(global), fJSFlags(kJSFlagNone) { }
         JSInterpreter() : Interpreter(), fJSFlags(kJSFlagNone) { }
         JSFlags Flags() const { return fJSFlags; }
 
@@ -52,14 +52,14 @@ class JSRun : public JSBase {
         virtual ~JSRun();
 
         UString GetSource() const;
-        JSObject *GlobalObject() const;
+        JSGlobalObject* GlobalObject() const;
         JSInterpreter* GetInterpreter();
         Completion Evaluate();
         bool CheckSyntax();
         JSFlags Flags() const;
     private:
         UString fSource;
-        ProtectedPtr<JSObject> fGlobalObject;
+        ProtectedPtr<JSGlobalObject> fGlobalObject;
         RefPtr<JSInterpreter> fInterpreter;
         JSFlags fFlags;
 };

diff --git a/JavaScriptGlue/JSUtils.h b/JavaScriptGlue/JSUtils.h
index 470c68c498d20faee38f33ffe7a65c71535a4463..1fe8428e95351644fc3b5bddab02924d8b700171 100644 (file)
--- a/JavaScriptGlue/JSUtils.h
+++ b/JavaScriptGlue/JSUtils.h
@@ -33,6 +33,7 @@
 
 #include <JavaScriptCore/value.h>
 #include <JavaScriptCore/object.h>
+#include <JavaScriptCore/JSGlobalObject.h>
 #include <JavaScriptCore/types.h>
 #include <JavaScriptCore/interpreter.h>
 #include <JavaScriptCore/protect.h>