JavaScriptCore-7600.1.4.9.tar.gz

[apple/javascriptcore.git] / API / JSCallbackConstructor.cpp

diff --git a/API/JSCallbackConstructor.cpp b/API/JSCallbackConstructor.cpp
index 8340c10b4de3a6c343c556464702fac045197ce2..b5aeee418ca064e0adfe5e6d28fd6d681ee23598 100644 (file)
--- a/API/JSCallbackConstructor.cpp
+++ b/API/JSCallbackConstructor.cpp
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *

- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY

  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR

  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR


@@ -26,13 +26,13 @@
 #include "config.h"
 #include "JSCallbackConstructor.h"
 
 #include "config.h"
 #include "JSCallbackConstructor.h"
 

-#include "APIShims.h"
+#include "APICallbackFunction.h"

 #include "APICast.h"
 #include "Error.h"
 #include "JSGlobalObject.h"
 #include "JSLock.h"
 #include "ObjectPrototype.h"
 #include "APICast.h"
 #include "Error.h"
 #include "JSGlobalObject.h"
 #include "JSLock.h"
 #include "ObjectPrototype.h"

-#include "Operations.h"
+#include "JSCInlines.h"

 #include <wtf/Vector.h>
 
 namespace JSC {
 #include <wtf/Vector.h>
 
 namespace JSC {


@@ -49,7 +49,7 @@ JSCallbackConstructor::JSCallbackConstructor(JSGlobalObject* globalObject, Struc
 void JSCallbackConstructor::finishCreation(JSGlobalObject* globalObject, JSClassRef jsClass)
 {
     Base::finishCreation(globalObject->vm());
 void JSCallbackConstructor::finishCreation(JSGlobalObject* globalObject, JSClassRef jsClass)
 {
     Base::finishCreation(globalObject->vm());

-    ASSERT(inherits(&s_info));
+    ASSERT(inherits(info()));

     if (m_class)
         JSClassRetain(jsClass);
 }
     if (m_class)
         JSClassRetain(jsClass);
 }


@@ -65,40 +65,9 @@ void JSCallbackConstructor::destroy(JSCell* cell)
     static_cast<JSCallbackConstructor*>(cell)->JSCallbackConstructor::~JSCallbackConstructor();
 }
 
     static_cast<JSCallbackConstructor*>(cell)->JSCallbackConstructor::~JSCallbackConstructor();
 }
 

-static EncodedJSValue JSC_HOST_CALL constructJSCallback(ExecState* exec)
-{
-    JSObject* constructor = exec->callee();
-    JSContextRef ctx = toRef(exec);
-    JSObjectRef constructorRef = toRef(constructor);
-
-    JSObjectCallAsConstructorCallback callback = jsCast<JSCallbackConstructor*>(constructor)->callback();
-    if (callback) {
-        size_t argumentCount = exec->argumentCount();
-        Vector<JSValueRef, 16> arguments;
-        arguments.reserveInitialCapacity(argumentCount);
-        for (size_t i = 0; i < argumentCount; ++i)
-            arguments.uncheckedAppend(toRef(exec, exec->argument(i)));
-
-        JSValueRef exception = 0;
-        JSObjectRef result;
-        {
-            APICallbackShim callbackShim(exec);
-            result = callback(ctx, constructorRef, argumentCount, arguments.data(), &exception);
-        }
-        if (exception)
-            throwError(exec, toJS(exec, exception));
-        // result must be a valid JSValue.
-        if (!result)
-            return throwVMTypeError(exec);
-        return JSValue::encode(toJS(result));
-    }
-    
-    return JSValue::encode(toJS(JSObjectMake(ctx, jsCast<JSCallbackConstructor*>(constructor)->classRef(), 0)));
-}
-

 ConstructType JSCallbackConstructor::getConstructData(JSCell*, ConstructData& constructData)
 {
 ConstructType JSCallbackConstructor::getConstructData(JSCell*, ConstructData& constructData)
 {

-    constructData.native.function = constructJSCallback;
+    constructData.native.function = APICallbackFunction::construct<JSCallbackConstructor>;

     return ConstructTypeHost;
 }
 
     return ConstructTypeHost;
 }