| Paste number 49791: | build fix |
| Pasted by: | MacDome |
| When: | 1 year, 8 months ago |
| Share: | Tweet this! | http://paste.lisp.org/+12F3 |
| Channel: | #webkit |
| Paste contents: |
Index: ChangeLog
===================================================================
--- ChangeLog (revision 27021)
+++ ChangeLog (working copy)
@@ -1,3 +1,17 @@
+2007-10-25 Eric Seidel <eric@webkit.org>
+
+ Reviewed by NOBODY (OOPS!).
+
+ Make JSG build again after JSGlobalObject change.
+
+ * JSRun.cpp:
+ (JSRun::JSRun):
+ (JSRun::GlobalObject):
+ * JSRun.h:
+ (JSInterpreter::JSInterpreter):
+ * JSUtils.h:
+ * JavaScriptGlue.xcodeproj/project.pbxproj:
+
2007-10-11 Mark Rowe <mrowe@apple.com>
Reviewed by Tim Hatcher.
Index: JSRun.cpp
===================================================================
--- JSRun.cpp (revision 27021)
+++ JSRun.cpp (working copy)
@@ -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;
}
Index: JSRun.h
===================================================================
--- JSRun.h (revision 27021)
+++ JSRun.h (working copy)
@@ -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;
};
Index: JSUtils.h
===================================================================
--- JSUtils.h (revision 27021)
+++ JSUtils.h (working copy)
@@ -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>
This paste has no annotations.