Changeset 98203 in webkit


Ignore:
Timestamp:
Oct 23, 2011 2:14:02 PM (12 years ago)
Author:
mhahnenberg@apple.com
Message:

Remove getConstructDataVirtual
https://bugs.webkit.org/show_bug.cgi?id=70638

Reviewed by Darin Adler.

Source/JavaScriptCore:

Removed all declarations and definitions of getConstructDataVirtual.
Also replaced all call sites to getConstructDataVirtual with a
corresponding lookup in the MethodTable.

  • API/JSCallbackConstructor.cpp:
  • API/JSCallbackConstructor.h:
  • API/JSCallbackObject.h:
  • API/JSCallbackObjectFunctions.h:
  • API/JSObjectRef.cpp:

(JSObjectIsConstructor):
(JSObjectCallAsConstructor):

(JSC::Interpreter::privateExecute):

  • jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

  • runtime/ArrayConstructor.cpp:
  • runtime/ArrayConstructor.h:
  • runtime/BooleanConstructor.cpp:
  • runtime/BooleanConstructor.h:
  • runtime/DateConstructor.cpp:
  • runtime/DateConstructor.h:
  • runtime/Error.h:

(JSC::StrictModeTypeErrorFunction::getConstructData):

  • runtime/ErrorConstructor.cpp:
  • runtime/ErrorConstructor.h:
  • runtime/FunctionConstructor.cpp:
  • runtime/FunctionConstructor.h:
  • runtime/JSCell.cpp:
  • runtime/JSCell.h:
  • runtime/JSFunction.cpp:
  • runtime/JSFunction.h:
  • runtime/JSObject.h:

(JSC::getConstructData):

  • runtime/NativeErrorConstructor.cpp:
  • runtime/NativeErrorConstructor.h:
  • runtime/NumberConstructor.cpp:
  • runtime/NumberConstructor.h:
  • runtime/ObjectConstructor.cpp:
  • runtime/ObjectConstructor.h:
  • runtime/RegExpConstructor.cpp:
  • runtime/RegExpConstructor.h:
  • runtime/StringConstructor.cpp:
  • runtime/StringConstructor.h:

Source/WebCore:

No new tests.

Removed all declarations and definitions of getConstructDataVirtual.
Also replaced all call sites to getConstructDataVirtual with a
corresponding lookup in the MethodTable.

  • WebCore.exp.in:
  • bindings/js/JSAudioConstructor.cpp:
  • bindings/js/JSAudioConstructor.h:
  • bindings/js/JSImageConstructor.cpp:
  • bindings/js/JSImageConstructor.h:
  • bindings/js/JSOptionConstructor.cpp:
  • bindings/js/JSOptionConstructor.h:
  • bindings/js/ScriptFunctionCall.cpp:

(WebCore::ScriptFunctionCall::construct):

  • bindings/scripts/CodeGeneratorJS.pm:

(GenerateConstructorDeclaration):
(GenerateConstructorDefinition):

  • bridge/runtime_object.cpp:
  • bridge/runtime_object.h:

Source/WebKit/mac:

Removed all declarations and definitions of getConstructDataVirtual.
Also replaced all call sites to getConstructDataVirtual with a
corresponding lookup in the MethodTable.

  • Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::construct):

Source/WebKit2:

Removed all declarations and definitions of getConstructDataVirtual.
Also replaced all call sites to getConstructDataVirtual with a
corresponding lookup in the MethodTable.

  • WebProcess/Plugins/Netscape/JSNPObject.cpp:
  • WebProcess/Plugins/Netscape/JSNPObject.h:
Location:
trunk/Source
Files:
54 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/API/JSCallbackConstructor.cpp

    r97436 r98203  
    8787}
    8888
    89 ConstructType JSCallbackConstructor::getConstructDataVirtual(ConstructData& constructData)
    90 {
    91     return getConstructData(this, constructData);
    92 }
    93 
    9489ConstructType JSCallbackConstructor::getConstructData(JSCell*, ConstructData& constructData)
    9590{
  • trunk/Source/JavaScriptCore/API/JSCallbackConstructor.h

    r97436 r98203  
    5959
    6060private:
    61     virtual ConstructType getConstructDataVirtual(ConstructData&);
    6261    static ConstructType getConstructData(JSCell*, ConstructData&);
    6362
  • trunk/Source/JavaScriptCore/API/JSCallbackObject.h

    r98002 r98203  
    195195    virtual void getOwnPropertyNames(ExecState*, PropertyNameArray&, EnumerationMode mode = ExcludeDontEnumProperties);
    196196
    197     virtual ConstructType getConstructDataVirtual(ConstructData&);
    198197    static ConstructType getConstructData(JSCell*, ConstructData&);
    199198    static CallType getCallData(JSCell*, CallData&);
  • trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h

    r98002 r98203  
    336336
    337337template <class Parent>
    338 ConstructType JSCallbackObject<Parent>::getConstructDataVirtual(ConstructData& constructData)
    339 {
    340     return getConstructData(this, constructData);
    341 }
    342 
    343 template <class Parent>
    344338ConstructType JSCallbackObject<Parent>::getConstructData(JSCell* cell, ConstructData& constructData)
    345339{
  • trunk/Source/JavaScriptCore/API/JSObjectRef.cpp

    r97532 r98203  
    455455    JSObject* jsObject = toJS(object);
    456456    ConstructData constructData;
    457     return jsObject->getConstructDataVirtual(constructData) != ConstructTypeNone;
     457    return jsObject->methodTable()->getConstructData(jsObject, constructData) != ConstructTypeNone;
    458458}
    459459
     
    466466
    467467    ConstructData constructData;
    468     ConstructType constructType = jsObject->getConstructDataVirtual(constructData);
     468    ConstructType constructType = jsObject->methodTable()->getConstructData(jsObject, constructData);
    469469    if (constructType == ConstructTypeNone)
    470470        return 0;
  • trunk/Source/JavaScriptCore/ChangeLog

    r98201 r98203  
     12011-10-23  Mark Hahnenberg  <mhahnenberg@apple.com>
     2
     3        Remove getConstructDataVirtual
     4        https://bugs.webkit.org/show_bug.cgi?id=70638
     5
     6        Reviewed by Darin Adler.
     7
     8        Removed all declarations and definitions of getConstructDataVirtual.
     9        Also replaced all call sites to getConstructDataVirtual with a
     10        corresponding lookup in the MethodTable.
     11
     12        * API/JSCallbackConstructor.cpp:
     13        * API/JSCallbackConstructor.h:
     14        * API/JSCallbackObject.h:
     15        * API/JSCallbackObjectFunctions.h:
     16        * API/JSObjectRef.cpp:
     17        (JSObjectIsConstructor):
     18        (JSObjectCallAsConstructor):
     19        * JavaScriptCore.exp:
     20        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
     21        * dfg/DFGOperations.cpp:
     22        * interpreter/Interpreter.cpp:
     23        (JSC::Interpreter::privateExecute):
     24        * jit/JITStubs.cpp:
     25        (JSC::DEFINE_STUB_FUNCTION):
     26        * runtime/ArrayConstructor.cpp:
     27        * runtime/ArrayConstructor.h:
     28        * runtime/BooleanConstructor.cpp:
     29        * runtime/BooleanConstructor.h:
     30        * runtime/DateConstructor.cpp:
     31        * runtime/DateConstructor.h:
     32        * runtime/Error.h:
     33        (JSC::StrictModeTypeErrorFunction::getConstructData):
     34        * runtime/ErrorConstructor.cpp:
     35        * runtime/ErrorConstructor.h:
     36        * runtime/FunctionConstructor.cpp:
     37        * runtime/FunctionConstructor.h:
     38        * runtime/JSCell.cpp:
     39        * runtime/JSCell.h:
     40        * runtime/JSFunction.cpp:
     41        * runtime/JSFunction.h:
     42        * runtime/JSObject.h:
     43        (JSC::getConstructData):
     44        * runtime/NativeErrorConstructor.cpp:
     45        * runtime/NativeErrorConstructor.h:
     46        * runtime/NumberConstructor.cpp:
     47        * runtime/NumberConstructor.h:
     48        * runtime/ObjectConstructor.cpp:
     49        * runtime/ObjectConstructor.h:
     50        * runtime/RegExpConstructor.cpp:
     51        * runtime/RegExpConstructor.h:
     52        * runtime/StringConstructor.cpp:
     53        * runtime/StringConstructor.h:
     54
    1552011-10-23  Geoffrey Garen  <ggaren@apple.com>
    256
  • trunk/Source/JavaScriptCore/JavaScriptCore.exp

    r98177 r98203  
    265265__ZN3JSC6JSCell21deletePropertyVirtualEPNS_9ExecStateERKNS_10IdentifierE
    266266__ZN3JSC6JSCell21deletePropertyVirtualEPNS_9ExecStateEj
    267 __ZN3JSC6JSCell23getConstructDataVirtualERNS_13ConstructDataE
    268267__ZN3JSC6JSCell25getOwnPropertySlotVirtualEPNS_9ExecStateERKNS_10IdentifierERNS_12PropertySlotE
    269268__ZN3JSC6JSCell25getOwnPropertySlotVirtualEPNS_9ExecStateEjRNS_12PropertySlotE
  • trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def

    r98177 r98203  
    194194    ?getCallData@JSCell@JSC@@SA?AW4CallType@2@PAV12@AATCallData@2@@Z
    195195    ?getConstructData@JSCell@JSC@@SA?AW4ConstructType@2@PAV12@AATConstructData@2@@Z
    196     ?getConstructDataVirtual@JSCell@JSC@@UAE?AW4ConstructType@2@AATConstructData@2@@Z
    197196    ?getObject@JSCell@JSC@@QAEPAVJSObject@2@XZ
    198197    ?getOwnPropertyDescriptor@JSGlobalObject@JSC@@UAE_NPAVExecState@2@ABVIdentifier@2@AAVPropertyDescriptor@2@@Z
  • trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

    r97817 r98203  
    162162#if !ASSERT_DISABLED
    163163    ConstructData constructData;
    164     ASSERT(constructor->getConstructDataVirtual(constructData) == ConstructTypeJS);
     164    ASSERT(constructor->methodTable()->getConstructData(constructor, constructData) == ConstructTypeJS);
    165165#endif
    166166   
  • trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

    r97593 r98203  
    46104610#if !ASSERT_DISABLED
    46114611        ConstructData constructData;
    4612         ASSERT(constructor->getConstructDataVirtual(constructData) == ConstructTypeJS);
     4612        ASSERT(constructor->methodTable()->getConstructData(constructor, constructData) == ConstructTypeJS);
    46134613#endif
    46144614
  • trunk/Source/JavaScriptCore/jit/JITStubs.cpp

    r98179 r98203  
    12681268#if !ASSERT_DISABLED
    12691269    ConstructData constructData;
    1270     ASSERT(constructor->getConstructDataVirtual(constructData) == ConstructTypeJS);
     1270    ASSERT(constructor->methodTable()->getConstructData(constructor, constructData) == ConstructTypeJS);
    12711271#endif
    12721272
     
    21742174#if !ASSERT_DISABLED
    21752175    ConstructData constructData;
    2176     ASSERT(asFunction(stackFrame.callFrame->callee())->getConstructDataVirtual(constructData) == ConstructTypeJS);
     2176    ASSERT(asFunction(stackFrame.callFrame->callee())->methodTable()->getConstructData(stackFrame.callFrame->callee(), constructData) == ConstructTypeJS);
    21772177#endif
    21782178   
  • trunk/Source/JavaScriptCore/runtime/ArrayConstructor.cpp

    r97537 r98203  
    103103}
    104104
    105 ConstructType ArrayConstructor::getConstructDataVirtual(ConstructData& constructData)
    106 {
    107     return getConstructData(this, constructData);
    108 }
    109 
    110105ConstructType ArrayConstructor::getConstructData(JSCell*, ConstructData& constructData)
    111106{
  • trunk/Source/JavaScriptCore/runtime/ArrayConstructor.h

    r97537 r98203  
    5757        virtual bool getOwnPropertyDescriptor(ExecState*, const Identifier&, PropertyDescriptor&);
    5858
    59         virtual ConstructType getConstructDataVirtual(ConstructData&);
    6059        static ConstructType getConstructData(JSCell*, ConstructData&);
    6160        static CallType getCallData(JSCell*, CallData&);
  • trunk/Source/JavaScriptCore/runtime/BooleanConstructor.cpp

    r97436 r98203  
    5959}
    6060
    61 ConstructType BooleanConstructor::getConstructDataVirtual(ConstructData& constructData)
    62 {
    63     return getConstructData(this, constructData);
    64 }
    65 
    6661ConstructType BooleanConstructor::getConstructData(JSCell*, ConstructData& constructData)
    6762{
  • trunk/Source/JavaScriptCore/runtime/BooleanConstructor.h

    r97436 r98203  
    5151    private:
    5252        BooleanConstructor(JSGlobalObject*, Structure*);
    53         virtual ConstructType getConstructDataVirtual(ConstructData&);
    5453        static ConstructType getConstructData(JSCell*, ConstructData&);
    5554        static CallType getCallData(JSCell*, CallData&);
  • trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp

    r97537 r98203  
    162162}
    163163
    164 ConstructType DateConstructor::getConstructDataVirtual(ConstructData& constructData)
    165 {
    166     return getConstructData(this, constructData);
    167 }
    168 
    169164ConstructType DateConstructor::getConstructData(JSCell*, ConstructData& constructData)
    170165{
  • trunk/Source/JavaScriptCore/runtime/DateConstructor.h

    r97537 r98203  
    5252    private:
    5353        DateConstructor(JSGlobalObject*, Structure*);
    54         virtual ConstructType getConstructDataVirtual(ConstructData&);
    5554        static ConstructType getConstructData(JSCell*, ConstructData&);
    5655        static CallType getCallData(JSCell*, CallData&);
  • trunk/Source/JavaScriptCore/runtime/Error.h

    r97436 r98203  
    9999        }
    100100   
    101         virtual ConstructType getConstructDataVirtual(ConstructData& constructData)
     101        static ConstructType getConstructData(JSCell*, ConstructData& constructData)
    102102        {
    103103            constructData.native.function = constructThrowTypeError;
  • trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp

    r97436 r98203  
    5454}
    5555
    56 ConstructType ErrorConstructor::getConstructDataVirtual(ConstructData& constructData)
    57 {
    58     return getConstructData(this, constructData);
    59 }
    60 
    6156ConstructType ErrorConstructor::getConstructData(JSCell*, ConstructData& constructData)
    6257{
  • trunk/Source/JavaScriptCore/runtime/ErrorConstructor.h

    r97436 r98203  
    5252    private:
    5353        ErrorConstructor(JSGlobalObject*, Structure*);
    54         virtual ConstructType getConstructDataVirtual(ConstructData&);
    5554        static ConstructType getConstructData(JSCell*, ConstructData&);
    5655        static CallType getCallData(JSCell*, CallData&);
  • trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp

    r97436 r98203  
    5858    ArgList args(exec);
    5959    return JSValue::encode(constructFunction(exec, asInternalFunction(exec->callee())->globalObject(), args));
    60 }
    61 
    62 ConstructType FunctionConstructor::getConstructDataVirtual(ConstructData& constructData)
    63 {
    64     return getConstructData(this, constructData);
    6560}
    6661
  • trunk/Source/JavaScriptCore/runtime/FunctionConstructor.h

    r97436 r98203  
    4949        FunctionConstructor(JSGlobalObject*, Structure*);
    5050        void finishCreation(ExecState*, FunctionPrototype*);
    51         virtual ConstructType getConstructDataVirtual(ConstructData&);
    5251        static ConstructType getConstructData(JSCell*, ConstructData&);
    5352        static CallType getCallData(JSCell*, CallData&);
  • trunk/Source/JavaScriptCore/runtime/JSCell.cpp

    r98002 r98203  
    5858{
    5959    return CallTypeNone;
    60 }
    61 
    62 ConstructType JSCell::getConstructDataVirtual(ConstructData&)
    63 {
    64     return ConstructTypeNone;
    6560}
    6661
  • trunk/Source/JavaScriptCore/runtime/JSCell.h

    r98123 r98203  
    7575       
    7676        static CallType getCallData(JSCell*, CallData&);
    77         virtual ConstructType getConstructDataVirtual(ConstructData&);
    7877        static ConstructType getConstructData(JSCell*, ConstructData&);
    7978
     
    233232    }
    234233
    235     inline ConstructType getConstructData(JSValue value, ConstructData& constructData)
    236     {
    237         ConstructType result = value.isCell() ? value.asCell()->getConstructDataVirtual(constructData) : ConstructTypeNone;
    238         ASSERT(result == ConstructTypeNone || value.isValidCallee());
    239         return result;
    240     }
    241 
    242234    ALWAYS_INLINE bool JSValue::getUInt32(uint32_t& v) const
    243235    {
  • trunk/Source/JavaScriptCore/runtime/JSFunction.cpp

    r97905 r98203  
    363363}
    364364
    365 ConstructType JSFunction::getConstructDataVirtual(ConstructData& constructData)
    366 {
    367     return getConstructData(this, constructData);
    368 }
    369 
    370365// ECMA 13.2.2 [[Construct]]
    371366ConstructType JSFunction::getConstructData(JSCell* cell, ConstructData& constructData)
  • trunk/Source/JavaScriptCore/runtime/JSFunction.h

    r98179 r98203  
    108108        NativeFunction nativeConstructor();
    109109
    110         virtual ConstructType getConstructDataVirtual(ConstructData&);
    111110        static ConstructType getConstructData(JSCell*, ConstructData&);
    112111        static CallType getCallData(JSCell*, CallData&);
  • trunk/Source/JavaScriptCore/runtime/JSObject.h

    r98123 r98203  
    423423}
    424424
     425inline ConstructType getConstructData(JSValue value, ConstructData& constructData)
     426{
     427    ConstructType result = value.isCell() ? value.asCell()->methodTable()->getConstructData(value.asCell(), constructData) : ConstructTypeNone;
     428    ASSERT(result == ConstructTypeNone || value.isValidCallee());
     429    return result;
     430}
     431
    425432inline Structure* createEmptyObjectStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue prototype)
    426433{
  • trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp

    r97436 r98203  
    5757}
    5858
    59 ConstructType NativeErrorConstructor::getConstructDataVirtual(ConstructData& constructData)
    60 {
    61     return getConstructData(this, constructData);
    62 }
    63 
    6459ConstructType NativeErrorConstructor::getConstructData(JSCell*, ConstructData& constructData)
    6560{
  • trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.h

    r97436 r98203  
    6969        NativeErrorConstructor(JSGlobalObject*, Structure*);
    7070        static const unsigned StructureFlags = OverridesVisitChildren | InternalFunction::StructureFlags;
    71         virtual ConstructType getConstructDataVirtual(ConstructData&);
    7271        static ConstructType getConstructData(JSCell*, ConstructData&);
    7372        static CallType getCallData(JSCell*, CallData&);
  • trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp

    r97537 r98203  
    121121}
    122122
    123 ConstructType NumberConstructor::getConstructDataVirtual(ConstructData& constructData)
    124 {
    125     return getConstructData(this, constructData);
    126 }
    127 
    128123ConstructType NumberConstructor::getConstructData(JSCell*, ConstructData& constructData)
    129124{
  • trunk/Source/JavaScriptCore/runtime/NumberConstructor.h

    r97537 r98203  
    5959    private:
    6060        NumberConstructor(JSGlobalObject*, Structure*);
    61         virtual ConstructType getConstructDataVirtual(ConstructData&);
    6261        static ConstructType getConstructData(JSCell*, ConstructData&);
    6362        static CallType getCallData(JSCell*, CallData&);
  • trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp

    r97537 r98203  
    120120}
    121121
    122 ConstructType ObjectConstructor::getConstructDataVirtual(ConstructData& constructData)
    123 {
    124     return getConstructData(this, constructData);
    125 }
    126 
    127122ConstructType ObjectConstructor::getConstructData(JSCell*, ConstructData& constructData)
    128123{
  • trunk/Source/JavaScriptCore/runtime/ObjectConstructor.h

    r97537 r98203  
    5656    private:
    5757        ObjectConstructor(JSGlobalObject*, Structure*);
    58         virtual ConstructType getConstructDataVirtual(ConstructData&);
    5958        static ConstructType getConstructData(JSCell*, ConstructData&);
    6059        static CallType getCallData(JSCell*, CallData&);
  • trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp

    r97817 r98203  
    355355}
    356356
    357 ConstructType RegExpConstructor::getConstructDataVirtual(ConstructData& constructData)
    358 {
    359     return getConstructData(this, constructData);
    360 }
    361 
    362357ConstructType RegExpConstructor::getConstructData(JSCell*, ConstructData& constructData)
    363358{
  • trunk/Source/JavaScriptCore/runtime/RegExpConstructor.h

    r97537 r98203  
    101101    private:
    102102        RegExpConstructor(JSGlobalObject*, Structure*);
    103         virtual ConstructType getConstructDataVirtual(ConstructData&);
    104103        static ConstructType getConstructData(JSCell*, ConstructData&);
    105104        static CallType getCallData(JSCell*, CallData&);
  • trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp

    r97827 r98203  
    106106}
    107107
    108 ConstructType StringConstructor::getConstructDataVirtual(ConstructData& constructData)
    109 {
    110     return getConstructData(this, constructData);
    111 }
    112 
    113108ConstructType StringConstructor::getConstructData(JSCell*, ConstructData& constructData)
    114109{
  • trunk/Source/JavaScriptCore/runtime/StringConstructor.h

    r97537 r98203  
    5252        StringConstructor(JSGlobalObject*, Structure*);
    5353        void finishCreation(ExecState*, StringPrototype*);
    54         virtual ConstructType getConstructDataVirtual(ConstructData&);
    5554        static ConstructType getConstructData(JSCell*, ConstructData&);
    5655        static CallType getCallData(JSCell*, CallData&);
  • trunk/Source/WebCore/ChangeLog

    r98199 r98203  
     12011-10-23  Mark Hahnenberg  <mhahnenberg@apple.com>
     2
     3        Remove getConstructDataVirtual
     4        https://bugs.webkit.org/show_bug.cgi?id=70638
     5
     6        Reviewed by Darin Adler.
     7
     8        No new tests.
     9
     10        Removed all declarations and definitions of getConstructDataVirtual.
     11        Also replaced all call sites to getConstructDataVirtual with a
     12        corresponding lookup in the MethodTable.
     13
     14        * WebCore.exp.in:
     15        * bindings/js/JSAudioConstructor.cpp:
     16        * bindings/js/JSAudioConstructor.h:
     17        * bindings/js/JSImageConstructor.cpp:
     18        * bindings/js/JSImageConstructor.h:
     19        * bindings/js/JSOptionConstructor.cpp:
     20        * bindings/js/JSOptionConstructor.h:
     21        * bindings/js/ScriptFunctionCall.cpp:
     22        (WebCore::ScriptFunctionCall::construct):
     23        * bindings/scripts/CodeGeneratorJS.pm:
     24        (GenerateConstructorDeclaration):
     25        (GenerateConstructorDefinition):
     26        * bridge/runtime_object.cpp:
     27        * bridge/runtime_object.h:
     28
    1292011-10-22  Geoffrey Garen  <ggaren@apple.com>
    230
  • trunk/Source/WebCore/WebCore.exp.in

    r98177 r98203  
    17041704__ZN3JSC8Bindings13RuntimeObject18getOwnPropertySlotEPNS_6JSCellEPNS_9ExecStateERKNS_10IdentifierERNS_12PropertySlotE
    17051705__ZN3JSC8Bindings13RuntimeObject19getOwnPropertyNamesEPNS_9ExecStateERNS_17PropertyNameArrayENS_15EnumerationModeE
    1706 __ZN3JSC8Bindings13RuntimeObject23getConstructDataVirtualERNS_13ConstructDataE
    17071706__ZN3JSC8Bindings13RuntimeObject21deletePropertyVirtualEPNS_9ExecStateERKNS_10IdentifierE
    17081707__ZN3JSC8Bindings13RuntimeObject24getOwnPropertyDescriptorEPNS_9ExecStateERKNS_10IdentifierERNS_18PropertyDescriptorE
  • trunk/Source/WebCore/bindings/js/JSAudioConstructor.cpp

    r97436 r98203  
    7676}
    7777
    78 ConstructType JSAudioConstructor::getConstructDataVirtual(ConstructData& constructData)
    79 {
    80     return getConstructData(this, constructData);
    81 }
    82 
    8378ConstructType JSAudioConstructor::getConstructData(JSCell*, ConstructData& constructData)
    8479{
  • trunk/Source/WebCore/bindings/js/JSAudioConstructor.h

    r97436 r98203  
    5656        JSAudioConstructor(JSC::Structure*, JSDOMGlobalObject*);
    5757        void finishCreation(JSC::ExecState*, JSDOMGlobalObject*);
    58         virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);
    5958        static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
    6059    };
  • trunk/Source/WebCore/bindings/js/JSImageConstructor.cpp

    r97436 r98203  
    7575}
    7676
    77 ConstructType JSImageConstructor::getConstructDataVirtual(ConstructData& constructData)
    78 {
    79     return getConstructData(this, constructData);
    80 }
    81 
    8277ConstructType JSImageConstructor::getConstructData(JSCell*, ConstructData& constructData)
    8378{
  • trunk/Source/WebCore/bindings/js/JSImageConstructor.h

    r97436 r98203  
    4747        JSImageConstructor(JSC::Structure*, JSDOMGlobalObject*);
    4848        void finishCreation(JSC::ExecState*, JSDOMGlobalObject*);
    49         virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);
    5049        static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
    5150    };
  • trunk/Source/WebCore/bindings/js/JSOptionConstructor.cpp

    r97436 r98203  
    7676}
    7777
    78 ConstructType JSOptionConstructor::getConstructDataVirtual(ConstructData& constructData)
    79 {
    80     return getConstructData(this, constructData);
    81 }
    82 
    8378ConstructType JSOptionConstructor::getConstructData(JSCell*, ConstructData& constructData)
    8479{
  • trunk/Source/WebCore/bindings/js/JSOptionConstructor.h

    r97436 r98203  
    4848        JSOptionConstructor(JSC::Structure*, JSDOMGlobalObject*);
    4949        void finishCreation(JSC::ExecState*, JSDOMGlobalObject*);
    50         virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);
    5150        static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
    5251    };
  • trunk/Source/WebCore/bindings/js/ScriptFunctionCall.cpp

    r97436 r98203  
    176176
    177177    ConstructData constructData;
    178     ConstructType constructType = constructor->getConstructDataVirtual(constructData);
     178    ConstructType constructType = constructor->methodTable()->getConstructData(constructor, constructData);
    179179    if (constructType == ConstructTypeNone)
    180180        return ScriptObject();
  • trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

    r98199 r98203  
    32233223    if ($canConstruct) {
    32243224        push(@$outputArray, "    static JSC::EncodedJSValue JSC_HOST_CALL construct${className}(JSC::ExecState*);\n");
    3225         push(@$outputArray, "    virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);\n");
    32263225        push(@$outputArray, "    static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);\n");
    32273226    }
     
    33413340        }
    33423341
    3343         push(@$outputArray, "ConstructType ${constructorClassName}::getConstructDataVirtual(ConstructData& constructData)\n");
    3344         push(@$outputArray, "{\n");
    3345         push(@$outputArray, "    return getConstructData(this, constructData);\n");
    3346         push(@$outputArray, "}\n\n");
    3347 
    33483342        push(@$outputArray, "ConstructType ${constructorClassName}::getConstructData(JSCell*, ConstructData& constructData)\n");
    33493343        push(@$outputArray, "{\n");
  • trunk/Source/WebCore/bridge/runtime_object.cpp

    r97537 r98203  
    305305}
    306306
    307 ConstructType RuntimeObject::getConstructDataVirtual(ConstructData& constructData)
    308 {
    309     return getConstructData(this, constructData);
    310 }
    311 
    312307ConstructType RuntimeObject::getConstructData(JSCell* cell, ConstructData& constructData)
    313308{
  • trunk/Source/WebCore/bridge/runtime_object.h

    r97537 r98203  
    5555    virtual JSValue defaultValue(ExecState*, PreferredPrimitiveType) const;
    5656    static CallType getCallData(JSCell*, CallData&);
    57     virtual ConstructType getConstructDataVirtual(ConstructData&);
    5857    static ConstructType getConstructData(JSCell*, ConstructData&);
    5958
  • trunk/Source/WebKit/mac/ChangeLog

    r98038 r98203  
     12011-10-23  Mark Hahnenberg  <mhahnenberg@apple.com>
     2
     3        Remove getConstructDataVirtual
     4        https://bugs.webkit.org/show_bug.cgi?id=70638
     5
     6        Reviewed by Darin Adler.
     7
     8        Removed all declarations and definitions of getConstructDataVirtual.
     9        Also replaced all call sites to getConstructDataVirtual with a
     10        corresponding lookup in the MethodTable.
     11
     12        * Plugins/Hosted/NetscapePluginInstanceProxy.mm:
     13        (WebKit::NetscapePluginInstanceProxy::construct):
     14
    1152011-10-20  Ian Henderson  <ianh@apple.com>
    216
  • trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm

    r97532 r98203  
    979979
    980980    ConstructData constructData;
    981     ConstructType constructType = object->getConstructDataVirtual(constructData);
     981    ConstructType constructType = object->methodTable()->getConstructData(object, constructData);
    982982    if (constructType == ConstructTypeNone)
    983983        return false;
  • trunk/Source/WebKit2/ChangeLog

    r98189 r98203  
     12011-10-23  Mark Hahnenberg  <mhahnenberg@apple.com>
     2
     3        Remove getConstructDataVirtual
     4        https://bugs.webkit.org/show_bug.cgi?id=70638
     5
     6        Reviewed by Darin Adler.
     7
     8        Removed all declarations and definitions of getConstructDataVirtual.
     9        Also replaced all call sites to getConstructDataVirtual with a
     10        corresponding lookup in the MethodTable.
     11
     12        * WebProcess/Plugins/Netscape/JSNPObject.cpp:
     13        * WebProcess/Plugins/Netscape/JSNPObject.h:
     14
    1152011-10-21  Alexey Proskuryakov  <ap@apple.com>
    216
  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp

    r98002 r98203  
    237237}
    238238
    239 ConstructType JSNPObject::getConstructDataVirtual(ConstructData& constructData)
    240 {
    241     return getConstructData(this, constructData);
    242 }
    243 
    244239ConstructType JSNPObject::getConstructData(JSCell* cell, ConstructData& constructData)
    245240{
  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h

    r98002 r98203  
    8181
    8282    static JSC::CallType getCallData(JSC::JSCell*, JSC::CallData&);
    83     virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);
    8483    static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
    8584
Note: See TracChangeset for help on using the changeset viewer.