Changeset 33979 in webkit for trunk/JavaScriptCore/API

Timestamp:

May 21, 2008, 6:20:45 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish branch into trunk.

Location:

trunk/JavaScriptCore/API

Files:

• APICast.h (modified) (1 diff)
• JSBase.cpp (modified) (1 diff)
• JSCallbackConstructor.cpp (modified) (1 diff)
• JSCallbackConstructor.h (modified) (2 diffs)
• JSCallbackObject.h (modified) (2 diffs)
• JSCallbackObjectFunctions.h (modified) (5 diffs)
• JSObjectRef.cpp (modified) (1 diff)
• JSValueRef.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/APICast.h

@@ -109 +109 @@
 inline JSGlobalContextRef toGlobalRef(KJS::ExecState* e)
 {
-    ASSERT(!e->callingExecState());
     return reinterpret_cast<JSGlobalContextRef>(e);
 }

trunk/JavaScriptCore/API/JSBase.cpp

@@ -45 +45 @@
     UString::Rep* scriptRep = toJS(script);
     UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null;
+
     // Interpreter::evaluate sets "this" to the global object if it is NULL
-    Completion completion = Interpreter::evaluate(exec->dynamicGlobalObject()->globalExec(), UString(sourceURLRep), startingLineNumber, UString(scriptRep), jsThisObject);
+    JSGlobalObject* globalObject = exec->dynamicGlobalObject();
+    Completion completion = Interpreter::evaluate(globalObject->globalExec(), globalObject->globalScopeChain(), UString(sourceURLRep), startingLineNumber, UString(scriptRep), jsThisObject);
 
     if (completion.complType() == Throw) {

trunk/JavaScriptCore/API/JSCallbackConstructor.cpp

@@ -57 +57 @@
 }
 
-bool JSCallbackConstructor::implementsConstruct() const
+ConstructType JSCallbackConstructor::getConstructData(ConstructData&)
 {
-    return true;
+    return ConstructTypeNative;
 }
 

trunk/JavaScriptCore/API/JSCallbackConstructor.h

@@ -33 +33 @@
 namespace KJS {
 
-class JSCallbackConstructor : public JSObject
-{
+class JSCallbackConstructor : public JSObject {
 public:
     JSCallbackConstructor(ExecState* exec, JSClassRef jsClass, JSObjectCallAsConstructorCallback callback);
@@ -41 +40 @@
     virtual bool implementsHasInstance() const;
     
-    virtual bool implementsConstruct() const;
-    virtual JSObject* construct(ExecState*, const List &args);
+    virtual ConstructType getConstructData(ConstructData&);
+    virtual JSObject* construct(ExecState*, const List& args);
     
     virtual const ClassInfo *classInfo() const { return &info; }

trunk/JavaScriptCore/API/JSCallbackObject.h

@@ -54 +54 @@
     virtual bool deleteProperty(ExecState*, unsigned);
 
-    virtual bool implementsConstruct() const;
+    virtual ConstructType getConstructData(ConstructData&);
     virtual JSObject* construct(ExecState*, const List& args);
 
@@ -60 +60 @@
     virtual bool hasInstance(ExecState *exec, JSValue *value);
 
-    virtual bool implementsCall() const;
+    virtual CallType getCallData(CallData&);
     virtual JSValue* callAsFunction(ExecState*, JSObject* thisObj, const List &args);
 

trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -238 +238 @@
 
 template <class Base>
-bool JSCallbackObject<Base>::implementsConstruct() const
+ConstructType JSCallbackObject<Base>::getConstructData(ConstructData&)
 {
     for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
         if (jsClass->callAsConstructor)
-            return true;
-    
-    return false;
+            return ConstructTypeNative;
+    
+    return ConstructTypeNone;
 }
 
@@ -264 +264 @@
     }
     
-    ASSERT(0); // implementsConstruct should prevent us from reaching here
+    ASSERT(0); // getConstructData should prevent us from reaching here
     return 0;
 }
@@ -294 +294 @@
 }
 
-
-template <class Base>
-bool JSCallbackObject<Base>::implementsCall() const
+template <class Base>
+CallType JSCallbackObject<Base>::getCallData(CallData&)
 {
     for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
         if (jsClass->callAsFunction)
-            return true;
-    
-    return false;
+            return CallTypeNative;
+    
+    return CallTypeNone;
 }
 
@@ -323 +322 @@
     }
     
-    ASSERT_NOT_REACHED(); // implementsCall should prevent us from reaching here
+    ASSERT_NOT_REACHED(); // getCallData should prevent us from reaching here
     return 0;
 }
@@ -368 +367 @@
 double JSCallbackObject<Base>::toNumber(ExecState* exec) const
 {
+    // We need this check to guard against the case where this object is rhs of
+    // a binary expression where lhs threw an exception in its conversion to
+    // primitive
+    if (exec->hadException())
+        return NaN;
     JSContextRef ctx = toRef(exec);
     JSObjectRef thisRef = toRef(this);

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -299 +299 @@
 {
     JSObject* jsObject = toJS(object);
-    return jsObject->implementsConstruct();
+    ConstructData constructData;
+    return jsObject->getConstructData(constructData) != ConstructTypeNone;
 }
 

trunk/JavaScriptCore/API/JSValueRef.cpp

@@ -135 +135 @@
 bool JSValueIsStrictEqual(JSContextRef ctx, JSValueRef a, JSValueRef b)
 {
-    JSLock lock;
-    ExecState* exec = toJS(ctx);
+    UNUSED_PARAM(ctx);
+
+    JSLock lock;
     JSValue* jsA = toJS(a);
     JSValue* jsB = toJS(b);
     
-    bool result = strictEqual(exec, jsA, jsB); // can't throw because it doesn't perform value conversion
-    ASSERT(!exec->hadException());
+    bool result = strictEqual(jsA, jsB);
     return result;
 }