Changeset 15212 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 7, 2006, 1:39:38 PM (19 years ago)

Author:

ggaren

Message:

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:

Location:

trunk/JavaScriptCore

Files:

• API/JSContextRef.cpp (modified) (1 diff)
• API/JSContextRef.h (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -72 +72 @@
 }
 
-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) {

trunk/JavaScriptCore/API/JSContextRef.h

@@ -50 +50 @@
   @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
@@ -56 +56 @@
   @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);
 
 /*!

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-07-07  Geoffrey Garen  <[email protected]>
+
+        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  <[email protected]>