Changeset 60708 in webkit for trunk/JavaScriptCore/runtime/ConstructData.cpp

Timestamp:

Jun 4, 2010, 2:38:38 PM (15 years ago)

Author:

[email protected]

Message:

Bug 40187 - Change function signature of NativeConstructor to match NativeFunction

Reviewed by Oliver Hunt.

Mostly for consistency, but constructor & args arguments are redundant,
and this will help if we wish to be able to JIT calls to more constructors.

JavaScriptCore:

• API/JSCallbackConstructor.cpp:

(JSC::constructJSCallback):

• API/JSCallbackObject.h:
• API/JSCallbackObjectFunctions.h:

(JSC::::construct):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::executeConstruct):

• interpreter/Interpreter.h:
• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/ArrayConstructor.cpp:

(JSC::constructWithArrayConstructor):

• runtime/BooleanConstructor.cpp:

(JSC::constructWithBooleanConstructor):

• runtime/ConstructData.cpp:

(JSC::construct):

• runtime/ConstructData.h:
• runtime/DateConstructor.cpp:

(JSC::constructWithDateConstructor):

• runtime/Error.cpp:

(JSC::constructNativeError):
(JSC::Error::create):

• runtime/ErrorConstructor.cpp:

(JSC::constructWithErrorConstructor):

• runtime/FunctionConstructor.cpp:

(JSC::constructWithFunctionConstructor):

• runtime/NativeErrorConstructor.cpp:

(JSC::constructWithNativeErrorConstructor):

• runtime/NativeErrorConstructor.h:

(JSC::NativeErrorConstructor::errorStructure):

• runtime/NumberConstructor.cpp:

(JSC::constructWithNumberConstructor):

• runtime/ObjectConstructor.cpp:

(JSC::constructWithObjectConstructor):

• runtime/RegExpConstructor.cpp:

(JSC::constructWithRegExpConstructor):

• runtime/StringConstructor.cpp:

(JSC::constructWithStringConstructor):

WebCore:

• bindings/js/JSArrayBufferConstructor.cpp:

(WebCore::constructCanvasArrayBuffer):

• bindings/js/JSAudioConstructor.cpp:

(WebCore::constructAudio):

• bindings/js/JSEventSourceConstructor.cpp:

(WebCore::constructEventSource):

• bindings/js/JSFloatArrayConstructor.cpp:

(WebCore::constructCanvasFloatArray):

• bindings/js/JSImageConstructor.cpp:

(WebCore::constructImage):

• bindings/js/JSInt16ArrayConstructor.cpp:

(WebCore::constructCanvasShortArray):

• bindings/js/JSInt32ArrayConstructor.cpp:

(WebCore::constructCanvasIntArray):

• bindings/js/JSInt8ArrayConstructor.cpp:

(WebCore::constructCanvasByteArray):

• bindings/js/JSMessageChannelConstructor.cpp:

(WebCore::JSMessageChannelConstructor::construct):

• bindings/js/JSMessageChannelConstructor.h:
• bindings/js/JSOptionConstructor.cpp:

(WebCore::constructHTMLOptionElement):

• bindings/js/JSSharedWorkerConstructor.cpp:

(WebCore::constructSharedWorker):

• bindings/js/JSUint16ArrayConstructor.cpp:

(WebCore::constructCanvasUnsignedShortArray):

• bindings/js/JSUint32ArrayConstructor.cpp:

(WebCore::constructCanvasUnsignedIntArray):

• bindings/js/JSUint8ArrayConstructor.cpp:

(WebCore::constructCanvasUnsignedByteArray):

• bindings/js/JSWebKitCSSMatrixConstructor.cpp:

(WebCore::constructWebKitCSSMatrix):

• bindings/js/JSWebKitPointConstructor.cpp:

(WebCore::constructWebKitPoint):

• bindings/js/JSWebSocketConstructor.cpp:

(WebCore::constructWebSocket):

• bindings/js/JSWorkerConstructor.cpp:

(WebCore::constructWorker):

• bindings/js/JSXMLHttpRequestConstructor.cpp:

(WebCore::constructXMLHttpRequest):

• bindings/js/JSXSLTProcessorConstructor.cpp:

(WebCore::constructXSLTProcessor):

• bindings/scripts/CodeGeneratorJS.pm:
• bridge/runtime_object.cpp:

(JSC::Bindings::callRuntimeConstructor):

File:

• trunk/JavaScriptCore/runtime/ConstructData.cpp (modified) (1 diff)

trunk/JavaScriptCore/runtime/ConstructData.cpp

@@ -34 +34 @@
 namespace JSC {
 
-JSObject* construct(ExecState* exec, JSValue object, ConstructType constructType, const ConstructData& constructData, const ArgList& args)
+JSObject* construct(ExecState* exec, JSValue constructorObject, ConstructType constructType, const ConstructData& constructData, const ArgList& args)
 {
-    if (constructType == ConstructTypeHost)
-        return constructData.native.function(exec, asObject(object), args);
-
-    ASSERT(constructType == ConstructTypeJS);
-    JSFunction* jsFunction = asFunction(object);
-
-    ASSERT(!jsFunction->isHostFunction());
-    Structure* structure;
-    JSValue prototype = jsFunction->get(exec, exec->propertyNames().prototype);
-    if (prototype.isObject())
-        structure = asObject(prototype)->inheritorID();
-    else
-        structure = exec->lexicalGlobalObject()->emptyObjectStructure();
-    JSObject* thisObj = new (exec) JSObject(structure);
-
-    JSValue result = exec->interpreter()->executeConstruct(jsFunction->jsExecutable(), exec, jsFunction, thisObj, args, jsFunction->scope().node(), exec->exceptionSlot());
-    if (exec->hadException() || !result.isObject())
-        return thisObj;
-    return asObject(result);
+    ASSERT(constructType == ConstructTypeJS || constructType == ConstructTypeHost);
+    return exec->interpreter()->executeConstruct(exec, asObject(constructorObject), constructType, constructData, args, exec->exceptionSlot());
 }