Build fix.
authoradachan@apple.com <adachan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Dec 2007 19:33:04 +0000 (19:33 +0000)
committeradachan@apple.com <adachan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Dec 2007 19:33:04 +0000 (19:33 +0000)
        Reviewed by Geoff.

        * WebScriptCallFrame.cpp:
        (WebScriptCallFrame::valueByEvaluatingJavaScriptFromString):

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

WebKit/win/ChangeLog
WebKit/win/WebScriptCallFrame.cpp

index 9f266a8..134f976 100644 (file)
@@ -1,3 +1,12 @@
+2007-12-06  Ada Chan  <adachan@apple.com>
+
+        Build fix.
+
+        Reviewed by Geoff.
+
+        * WebScriptCallFrame.cpp:
+        (WebScriptCallFrame::valueByEvaluatingJavaScriptFromString):
+
 2007-12-04  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Darin Adler.
index 4b1866a..7369ec2 100644 (file)
@@ -33,6 +33,7 @@
 #include "COMEnumVariant.h"
 #include "Function.h"
 
+#include <JavaScriptCore/Interpreter.h>
 #include <JavaScriptCore/JSGlobalObject.h>
 #include <JavaScriptCore/JSStringRefBSTR.h>
 #include <JavaScriptCore/JSValueRef.h>
@@ -222,8 +223,7 @@ HRESULT STDMETHODCALLTYPE WebScriptCallFrame::valueForVariable(
 JSValue* WebScriptCallFrame::valueByEvaluatingJavaScriptFromString(BSTR script)
 {
     ExecState* state = m_state;
-    Interpreter* interp  = state->dynamicInterpreter();
-    JSGlobalObject* globObj = interp->globalObject();
+    JSGlobalObject* globObj = state->dynamicGlobalObject();
 
     // find "eval"
     JSObject* eval = 0;
@@ -249,7 +249,7 @@ JSValue* WebScriptCallFrame::valueByEvaluatingJavaScriptFromString(BSTR script)
         scriptExecutionResult = eval->call(state, 0, args);
     } else
         // no "eval", or no context (i.e. global scope) - use global fallback
-        scriptExecutionResult = interp->evaluate(UString(), 0, code.data(), code.size(), globObj).value();
+        scriptExecutionResult = Interpreter::evaluate(state, UString(), 0, code.data(), code.size(), globObj).value();
 
     if (state->hadException())
         scriptExecutionResult = state->exception();    // (may be redundant depending on which eval path was used)