Reviewed by John, mocked by Darin.

        - Changed JSEvaluate to take a JSObjectRef instead of a JSValueRef as
        "this," since "this" must be an object.

        * API/JSContextRef.cpp:
        (JSEvaluate):
        * API/JSContextRef.h:

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

diff --git a/JavaScriptCore/API/JSContextRef.cpp b/JavaScriptCore/API/JSContextRef.cpp
index e7f744d89d7f0379cfd09ea3afd8aaca5a6fadc5..2acbfb321359348c0138513e95019f7d49e171eb 100644 (file)
--- a/JavaScriptCore/API/JSContextRef.cpp
+++ b/JavaScriptCore/API/JSContextRef.cpp
@@ -71,15 +71,15 @@ JSObjectRef JSContextGetGlobalObject(JSContextRef context)
     return toRef(exec->dynamicInterpreter()->globalObject());
 }
 
-JSValueRef JSEvaluate(JSContextRef context, JSStringBufferRef script, JSValueRef thisValue, JSStringBufferRef sourceURL, int startingLineNumber, JSValueRef* exception)
+JSValueRef JSEvaluate(JSContextRef context, JSStringBufferRef script, JSObjectRef thisObject, JSStringBufferRef sourceURL, int startingLineNumber, JSValueRef* exception)
 {
     JSLock lock;
     ExecState* exec = toJS(context);
-    JSValue* jsThisValue = toJS(thisValue);
+    JSObject* jsThisObject = toJS(thisObject);
     UString::Rep* scriptRep = toJS(script);
     UString::Rep* sourceURLRep = toJS(sourceURL);
-    // Interpreter::evaluate sets thisValue to the global object if it is NULL
-    Completion completion = exec->dynamicInterpreter()->evaluate(UString(sourceURLRep), startingLineNumber, UString(scriptRep), jsThisValue);
+    // Interpreter::evaluate sets "this" to the global object if it is NULL
+    Completion completion = exec->dynamicInterpreter()->evaluate(UString(sourceURLRep), startingLineNumber, UString(scriptRep), jsThisObject);
 
     if (completion.complType() == Throw) {
         if (exception)

diff --git a/JavaScriptCore/API/JSContextRef.h b/JavaScriptCore/API/JSContextRef.h
index 8850d5cc5fdf30407723f0bf0f643cd3fec457d1..8abaa284c134476f429c2ee29031e0fa7edc0813 100644 (file)
--- a/JavaScriptCore/API/JSContextRef.h
+++ b/JavaScriptCore/API/JSContextRef.h
@@ -49,13 +49,13 @@ void JSContextClearException(JSContextRef context);
   Evaluates a string of JavaScript
   @param context            execution context to use
   @param script             a character buffer containing the JavaScript to evaluate
-  @param thisValue          object to use as "this," or NULL to use the global object as "this"
+  @param thisObject         the object to use as "this," or NULL to use the global object as "this."
   @param sourceURL          URL to the file containing the JavaScript, or NULL - this is only used for error reporting
   @param startingLineNumber the JavaScript's starting line number in the file located at sourceURL - this is only used for error reporting
   @param exception          pointer to a JSValueRef in which to store an uncaught exception, if any; can be NULL
   @result                   result of evaluation, or NULL if an uncaught exception was thrown
 */
-JSValueRef JSEvaluate(JSContextRef context, JSStringBufferRef script, JSValueRef thisValue, JSStringBufferRef sourceURL, int startingLineNumber, JSValueRef* exception);
+JSValueRef JSEvaluate(JSContextRef context, JSStringBufferRef script, JSObjectRef thisObject, JSStringBufferRef sourceURL, int startingLineNumber, JSValueRef* exception);
 
 /*!
   @function JSCheckSyntax

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3598c6fd783340e2324026dabebc4e6dc05daeae..dc10a4bf87781546b2a995b29fe3fa352dfc5565 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-07  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by John, mocked by Darin.
+        
+        - Changed JSEvaluate to take a JSObjectRef instead of a JSValueRef as
+        "this," since "this" must be an object.
+
+        * API/JSContextRef.cpp:
+        (JSEvaluate):
+        * API/JSContextRef.h:
+
 2006-07-07  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by John.