Changeset 33979 in webkit for trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h

Timestamp:

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

Author:

[email protected]

Message:

Merge squirrelfish branch into trunk.

File:

• trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h (modified) (5 diffs)

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);