Changeset 98203 in webkit
- Timestamp:
- Oct 23, 2011 2:14:02 PM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 54 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/API/JSCallbackConstructor.cpp
r97436 r98203 87 87 } 88 88 89 ConstructType JSCallbackConstructor::getConstructDataVirtual(ConstructData& constructData)90 {91 return getConstructData(this, constructData);92 }93 94 89 ConstructType JSCallbackConstructor::getConstructData(JSCell*, ConstructData& constructData) 95 90 { -
trunk/Source/JavaScriptCore/API/JSCallbackConstructor.h
r97436 r98203 59 59 60 60 private: 61 virtual ConstructType getConstructDataVirtual(ConstructData&);62 61 static ConstructType getConstructData(JSCell*, ConstructData&); 63 62 -
trunk/Source/JavaScriptCore/API/JSCallbackObject.h
r98002 r98203 195 195 virtual void getOwnPropertyNames(ExecState*, PropertyNameArray&, EnumerationMode mode = ExcludeDontEnumProperties); 196 196 197 virtual ConstructType getConstructDataVirtual(ConstructData&);198 197 static ConstructType getConstructData(JSCell*, ConstructData&); 199 198 static CallType getCallData(JSCell*, CallData&); -
trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h
r98002 r98203 336 336 337 337 template <class Parent> 338 ConstructType JSCallbackObject<Parent>::getConstructDataVirtual(ConstructData& constructData)339 {340 return getConstructData(this, constructData);341 }342 343 template <class Parent>344 338 ConstructType JSCallbackObject<Parent>::getConstructData(JSCell* cell, ConstructData& constructData) 345 339 { -
trunk/Source/JavaScriptCore/API/JSObjectRef.cpp
r97532 r98203 455 455 JSObject* jsObject = toJS(object); 456 456 ConstructData constructData; 457 return jsObject-> getConstructDataVirtual(constructData) != ConstructTypeNone;457 return jsObject->methodTable()->getConstructData(jsObject, constructData) != ConstructTypeNone; 458 458 } 459 459 … … 466 466 467 467 ConstructData constructData; 468 ConstructType constructType = jsObject-> getConstructDataVirtual(constructData);468 ConstructType constructType = jsObject->methodTable()->getConstructData(jsObject, constructData); 469 469 if (constructType == ConstructTypeNone) 470 470 return 0; -
trunk/Source/JavaScriptCore/ChangeLog
r98201 r98203 1 2011-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 1 55 2011-10-23 Geoffrey Garen <ggaren@apple.com> 2 56 -
trunk/Source/JavaScriptCore/JavaScriptCore.exp
r98177 r98203 265 265 __ZN3JSC6JSCell21deletePropertyVirtualEPNS_9ExecStateERKNS_10IdentifierE 266 266 __ZN3JSC6JSCell21deletePropertyVirtualEPNS_9ExecStateEj 267 __ZN3JSC6JSCell23getConstructDataVirtualERNS_13ConstructDataE268 267 __ZN3JSC6JSCell25getOwnPropertySlotVirtualEPNS_9ExecStateERKNS_10IdentifierERNS_12PropertySlotE 269 268 __ZN3JSC6JSCell25getOwnPropertySlotVirtualEPNS_9ExecStateEjRNS_12PropertySlotE -
trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def
r98177 r98203 194 194 ?getCallData@JSCell@JSC@@SA?AW4CallType@2@PAV12@AATCallData@2@@Z 195 195 ?getConstructData@JSCell@JSC@@SA?AW4ConstructType@2@PAV12@AATConstructData@2@@Z 196 ?getConstructDataVirtual@JSCell@JSC@@UAE?AW4ConstructType@2@AATConstructData@2@@Z197 196 ?getObject@JSCell@JSC@@QAEPAVJSObject@2@XZ 198 197 ?getOwnPropertyDescriptor@JSGlobalObject@JSC@@UAE_NPAVExecState@2@ABVIdentifier@2@AAVPropertyDescriptor@2@@Z -
trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp
r97817 r98203 162 162 #if !ASSERT_DISABLED 163 163 ConstructData constructData; 164 ASSERT(constructor-> getConstructDataVirtual(constructData) == ConstructTypeJS);164 ASSERT(constructor->methodTable()->getConstructData(constructor, constructData) == ConstructTypeJS); 165 165 #endif 166 166 -
trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp
r97593 r98203 4610 4610 #if !ASSERT_DISABLED 4611 4611 ConstructData constructData; 4612 ASSERT(constructor-> getConstructDataVirtual(constructData) == ConstructTypeJS);4612 ASSERT(constructor->methodTable()->getConstructData(constructor, constructData) == ConstructTypeJS); 4613 4613 #endif 4614 4614 -
trunk/Source/JavaScriptCore/jit/JITStubs.cpp
r98179 r98203 1268 1268 #if !ASSERT_DISABLED 1269 1269 ConstructData constructData; 1270 ASSERT(constructor-> getConstructDataVirtual(constructData) == ConstructTypeJS);1270 ASSERT(constructor->methodTable()->getConstructData(constructor, constructData) == ConstructTypeJS); 1271 1271 #endif 1272 1272 … … 2174 2174 #if !ASSERT_DISABLED 2175 2175 ConstructData constructData; 2176 ASSERT(asFunction(stackFrame.callFrame->callee())-> getConstructDataVirtual(constructData) == ConstructTypeJS);2176 ASSERT(asFunction(stackFrame.callFrame->callee())->methodTable()->getConstructData(stackFrame.callFrame->callee(), constructData) == ConstructTypeJS); 2177 2177 #endif 2178 2178 -
trunk/Source/JavaScriptCore/runtime/ArrayConstructor.cpp
r97537 r98203 103 103 } 104 104 105 ConstructType ArrayConstructor::getConstructDataVirtual(ConstructData& constructData)106 {107 return getConstructData(this, constructData);108 }109 110 105 ConstructType ArrayConstructor::getConstructData(JSCell*, ConstructData& constructData) 111 106 { -
trunk/Source/JavaScriptCore/runtime/ArrayConstructor.h
r97537 r98203 57 57 virtual bool getOwnPropertyDescriptor(ExecState*, const Identifier&, PropertyDescriptor&); 58 58 59 virtual ConstructType getConstructDataVirtual(ConstructData&);60 59 static ConstructType getConstructData(JSCell*, ConstructData&); 61 60 static CallType getCallData(JSCell*, CallData&); -
trunk/Source/JavaScriptCore/runtime/BooleanConstructor.cpp
r97436 r98203 59 59 } 60 60 61 ConstructType BooleanConstructor::getConstructDataVirtual(ConstructData& constructData)62 {63 return getConstructData(this, constructData);64 }65 66 61 ConstructType BooleanConstructor::getConstructData(JSCell*, ConstructData& constructData) 67 62 { -
trunk/Source/JavaScriptCore/runtime/BooleanConstructor.h
r97436 r98203 51 51 private: 52 52 BooleanConstructor(JSGlobalObject*, Structure*); 53 virtual ConstructType getConstructDataVirtual(ConstructData&);54 53 static ConstructType getConstructData(JSCell*, ConstructData&); 55 54 static CallType getCallData(JSCell*, CallData&); -
trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp
r97537 r98203 162 162 } 163 163 164 ConstructType DateConstructor::getConstructDataVirtual(ConstructData& constructData)165 {166 return getConstructData(this, constructData);167 }168 169 164 ConstructType DateConstructor::getConstructData(JSCell*, ConstructData& constructData) 170 165 { -
trunk/Source/JavaScriptCore/runtime/DateConstructor.h
r97537 r98203 52 52 private: 53 53 DateConstructor(JSGlobalObject*, Structure*); 54 virtual ConstructType getConstructDataVirtual(ConstructData&);55 54 static ConstructType getConstructData(JSCell*, ConstructData&); 56 55 static CallType getCallData(JSCell*, CallData&); -
trunk/Source/JavaScriptCore/runtime/Error.h
r97436 r98203 99 99 } 100 100 101 virtual ConstructType getConstructDataVirtual(ConstructData& constructData)101 static ConstructType getConstructData(JSCell*, ConstructData& constructData) 102 102 { 103 103 constructData.native.function = constructThrowTypeError; -
trunk/Source/JavaScriptCore/runtime/ErrorConstructor.cpp
r97436 r98203 54 54 } 55 55 56 ConstructType ErrorConstructor::getConstructDataVirtual(ConstructData& constructData)57 {58 return getConstructData(this, constructData);59 }60 61 56 ConstructType ErrorConstructor::getConstructData(JSCell*, ConstructData& constructData) 62 57 { -
trunk/Source/JavaScriptCore/runtime/ErrorConstructor.h
r97436 r98203 52 52 private: 53 53 ErrorConstructor(JSGlobalObject*, Structure*); 54 virtual ConstructType getConstructDataVirtual(ConstructData&);55 54 static ConstructType getConstructData(JSCell*, ConstructData&); 56 55 static CallType getCallData(JSCell*, CallData&); -
trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp
r97436 r98203 58 58 ArgList args(exec); 59 59 return JSValue::encode(constructFunction(exec, asInternalFunction(exec->callee())->globalObject(), args)); 60 }61 62 ConstructType FunctionConstructor::getConstructDataVirtual(ConstructData& constructData)63 {64 return getConstructData(this, constructData);65 60 } 66 61 -
trunk/Source/JavaScriptCore/runtime/FunctionConstructor.h
r97436 r98203 49 49 FunctionConstructor(JSGlobalObject*, Structure*); 50 50 void finishCreation(ExecState*, FunctionPrototype*); 51 virtual ConstructType getConstructDataVirtual(ConstructData&);52 51 static ConstructType getConstructData(JSCell*, ConstructData&); 53 52 static CallType getCallData(JSCell*, CallData&); -
trunk/Source/JavaScriptCore/runtime/JSCell.cpp
r98002 r98203 58 58 { 59 59 return CallTypeNone; 60 }61 62 ConstructType JSCell::getConstructDataVirtual(ConstructData&)63 {64 return ConstructTypeNone;65 60 } 66 61 -
trunk/Source/JavaScriptCore/runtime/JSCell.h
r98123 r98203 75 75 76 76 static CallType getCallData(JSCell*, CallData&); 77 virtual ConstructType getConstructDataVirtual(ConstructData&);78 77 static ConstructType getConstructData(JSCell*, ConstructData&); 79 78 … … 233 232 } 234 233 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 242 234 ALWAYS_INLINE bool JSValue::getUInt32(uint32_t& v) const 243 235 { -
trunk/Source/JavaScriptCore/runtime/JSFunction.cpp
r97905 r98203 363 363 } 364 364 365 ConstructType JSFunction::getConstructDataVirtual(ConstructData& constructData)366 {367 return getConstructData(this, constructData);368 }369 370 365 // ECMA 13.2.2 [[Construct]] 371 366 ConstructType JSFunction::getConstructData(JSCell* cell, ConstructData& constructData) -
trunk/Source/JavaScriptCore/runtime/JSFunction.h
r98179 r98203 108 108 NativeFunction nativeConstructor(); 109 109 110 virtual ConstructType getConstructDataVirtual(ConstructData&);111 110 static ConstructType getConstructData(JSCell*, ConstructData&); 112 111 static CallType getCallData(JSCell*, CallData&); -
trunk/Source/JavaScriptCore/runtime/JSObject.h
r98123 r98203 423 423 } 424 424 425 inline 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 425 432 inline Structure* createEmptyObjectStructure(JSGlobalData& globalData, JSGlobalObject* globalObject, JSValue prototype) 426 433 { -
trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp
r97436 r98203 57 57 } 58 58 59 ConstructType NativeErrorConstructor::getConstructDataVirtual(ConstructData& constructData)60 {61 return getConstructData(this, constructData);62 }63 64 59 ConstructType NativeErrorConstructor::getConstructData(JSCell*, ConstructData& constructData) 65 60 { -
trunk/Source/JavaScriptCore/runtime/NativeErrorConstructor.h
r97436 r98203 69 69 NativeErrorConstructor(JSGlobalObject*, Structure*); 70 70 static const unsigned StructureFlags = OverridesVisitChildren | InternalFunction::StructureFlags; 71 virtual ConstructType getConstructDataVirtual(ConstructData&);72 71 static ConstructType getConstructData(JSCell*, ConstructData&); 73 72 static CallType getCallData(JSCell*, CallData&); -
trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp
r97537 r98203 121 121 } 122 122 123 ConstructType NumberConstructor::getConstructDataVirtual(ConstructData& constructData)124 {125 return getConstructData(this, constructData);126 }127 128 123 ConstructType NumberConstructor::getConstructData(JSCell*, ConstructData& constructData) 129 124 { -
trunk/Source/JavaScriptCore/runtime/NumberConstructor.h
r97537 r98203 59 59 private: 60 60 NumberConstructor(JSGlobalObject*, Structure*); 61 virtual ConstructType getConstructDataVirtual(ConstructData&);62 61 static ConstructType getConstructData(JSCell*, ConstructData&); 63 62 static CallType getCallData(JSCell*, CallData&); -
trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
r97537 r98203 120 120 } 121 121 122 ConstructType ObjectConstructor::getConstructDataVirtual(ConstructData& constructData)123 {124 return getConstructData(this, constructData);125 }126 127 122 ConstructType ObjectConstructor::getConstructData(JSCell*, ConstructData& constructData) 128 123 { -
trunk/Source/JavaScriptCore/runtime/ObjectConstructor.h
r97537 r98203 56 56 private: 57 57 ObjectConstructor(JSGlobalObject*, Structure*); 58 virtual ConstructType getConstructDataVirtual(ConstructData&);59 58 static ConstructType getConstructData(JSCell*, ConstructData&); 60 59 static CallType getCallData(JSCell*, CallData&); -
trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp
r97817 r98203 355 355 } 356 356 357 ConstructType RegExpConstructor::getConstructDataVirtual(ConstructData& constructData)358 {359 return getConstructData(this, constructData);360 }361 362 357 ConstructType RegExpConstructor::getConstructData(JSCell*, ConstructData& constructData) 363 358 { -
trunk/Source/JavaScriptCore/runtime/RegExpConstructor.h
r97537 r98203 101 101 private: 102 102 RegExpConstructor(JSGlobalObject*, Structure*); 103 virtual ConstructType getConstructDataVirtual(ConstructData&);104 103 static ConstructType getConstructData(JSCell*, ConstructData&); 105 104 static CallType getCallData(JSCell*, CallData&); -
trunk/Source/JavaScriptCore/runtime/StringConstructor.cpp
r97827 r98203 106 106 } 107 107 108 ConstructType StringConstructor::getConstructDataVirtual(ConstructData& constructData)109 {110 return getConstructData(this, constructData);111 }112 113 108 ConstructType StringConstructor::getConstructData(JSCell*, ConstructData& constructData) 114 109 { -
trunk/Source/JavaScriptCore/runtime/StringConstructor.h
r97537 r98203 52 52 StringConstructor(JSGlobalObject*, Structure*); 53 53 void finishCreation(ExecState*, StringPrototype*); 54 virtual ConstructType getConstructDataVirtual(ConstructData&);55 54 static ConstructType getConstructData(JSCell*, ConstructData&); 56 55 static CallType getCallData(JSCell*, CallData&); -
trunk/Source/WebCore/ChangeLog
r98199 r98203 1 2011-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 1 29 2011-10-22 Geoffrey Garen <ggaren@apple.com> 2 30 -
trunk/Source/WebCore/WebCore.exp.in
r98177 r98203 1704 1704 __ZN3JSC8Bindings13RuntimeObject18getOwnPropertySlotEPNS_6JSCellEPNS_9ExecStateERKNS_10IdentifierERNS_12PropertySlotE 1705 1705 __ZN3JSC8Bindings13RuntimeObject19getOwnPropertyNamesEPNS_9ExecStateERNS_17PropertyNameArrayENS_15EnumerationModeE 1706 __ZN3JSC8Bindings13RuntimeObject23getConstructDataVirtualERNS_13ConstructDataE1707 1706 __ZN3JSC8Bindings13RuntimeObject21deletePropertyVirtualEPNS_9ExecStateERKNS_10IdentifierE 1708 1707 __ZN3JSC8Bindings13RuntimeObject24getOwnPropertyDescriptorEPNS_9ExecStateERKNS_10IdentifierERNS_18PropertyDescriptorE -
trunk/Source/WebCore/bindings/js/JSAudioConstructor.cpp
r97436 r98203 76 76 } 77 77 78 ConstructType JSAudioConstructor::getConstructDataVirtual(ConstructData& constructData)79 {80 return getConstructData(this, constructData);81 }82 83 78 ConstructType JSAudioConstructor::getConstructData(JSCell*, ConstructData& constructData) 84 79 { -
trunk/Source/WebCore/bindings/js/JSAudioConstructor.h
r97436 r98203 56 56 JSAudioConstructor(JSC::Structure*, JSDOMGlobalObject*); 57 57 void finishCreation(JSC::ExecState*, JSDOMGlobalObject*); 58 virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);59 58 static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&); 60 59 }; -
trunk/Source/WebCore/bindings/js/JSImageConstructor.cpp
r97436 r98203 75 75 } 76 76 77 ConstructType JSImageConstructor::getConstructDataVirtual(ConstructData& constructData)78 {79 return getConstructData(this, constructData);80 }81 82 77 ConstructType JSImageConstructor::getConstructData(JSCell*, ConstructData& constructData) 83 78 { -
trunk/Source/WebCore/bindings/js/JSImageConstructor.h
r97436 r98203 47 47 JSImageConstructor(JSC::Structure*, JSDOMGlobalObject*); 48 48 void finishCreation(JSC::ExecState*, JSDOMGlobalObject*); 49 virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);50 49 static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&); 51 50 }; -
trunk/Source/WebCore/bindings/js/JSOptionConstructor.cpp
r97436 r98203 76 76 } 77 77 78 ConstructType JSOptionConstructor::getConstructDataVirtual(ConstructData& constructData)79 {80 return getConstructData(this, constructData);81 }82 83 78 ConstructType JSOptionConstructor::getConstructData(JSCell*, ConstructData& constructData) 84 79 { -
trunk/Source/WebCore/bindings/js/JSOptionConstructor.h
r97436 r98203 48 48 JSOptionConstructor(JSC::Structure*, JSDOMGlobalObject*); 49 49 void finishCreation(JSC::ExecState*, JSDOMGlobalObject*); 50 virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);51 50 static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&); 52 51 }; -
trunk/Source/WebCore/bindings/js/ScriptFunctionCall.cpp
r97436 r98203 176 176 177 177 ConstructData constructData; 178 ConstructType constructType = constructor-> getConstructDataVirtual(constructData);178 ConstructType constructType = constructor->methodTable()->getConstructData(constructor, constructData); 179 179 if (constructType == ConstructTypeNone) 180 180 return ScriptObject(); -
trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
r98199 r98203 3223 3223 if ($canConstruct) { 3224 3224 push(@$outputArray, " static JSC::EncodedJSValue JSC_HOST_CALL construct${className}(JSC::ExecState*);\n"); 3225 push(@$outputArray, " virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);\n");3226 3225 push(@$outputArray, " static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);\n"); 3227 3226 } … … 3341 3340 } 3342 3341 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 3348 3342 push(@$outputArray, "ConstructType ${constructorClassName}::getConstructData(JSCell*, ConstructData& constructData)\n"); 3349 3343 push(@$outputArray, "{\n"); -
trunk/Source/WebCore/bridge/runtime_object.cpp
r97537 r98203 305 305 } 306 306 307 ConstructType RuntimeObject::getConstructDataVirtual(ConstructData& constructData)308 {309 return getConstructData(this, constructData);310 }311 312 307 ConstructType RuntimeObject::getConstructData(JSCell* cell, ConstructData& constructData) 313 308 { -
trunk/Source/WebCore/bridge/runtime_object.h
r97537 r98203 55 55 virtual JSValue defaultValue(ExecState*, PreferredPrimitiveType) const; 56 56 static CallType getCallData(JSCell*, CallData&); 57 virtual ConstructType getConstructDataVirtual(ConstructData&);58 57 static ConstructType getConstructData(JSCell*, ConstructData&); 59 58 -
trunk/Source/WebKit/mac/ChangeLog
r98038 r98203 1 2011-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 1 15 2011-10-20 Ian Henderson <ianh@apple.com> 2 16 -
trunk/Source/WebKit/mac/Plugins/Hosted/NetscapePluginInstanceProxy.mm
r97532 r98203 979 979 980 980 ConstructData constructData; 981 ConstructType constructType = object-> getConstructDataVirtual(constructData);981 ConstructType constructType = object->methodTable()->getConstructData(object, constructData); 982 982 if (constructType == ConstructTypeNone) 983 983 return false; -
trunk/Source/WebKit2/ChangeLog
r98189 r98203 1 2011-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 1 15 2011-10-21 Alexey Proskuryakov <ap@apple.com> 2 16 -
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp
r98002 r98203 237 237 } 238 238 239 ConstructType JSNPObject::getConstructDataVirtual(ConstructData& constructData)240 {241 return getConstructData(this, constructData);242 }243 244 239 ConstructType JSNPObject::getConstructData(JSCell* cell, ConstructData& constructData) 245 240 { -
trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.h
r98002 r98203 81 81 82 82 static JSC::CallType getCallData(JSC::JSCell*, JSC::CallData&); 83 virtual JSC::ConstructType getConstructDataVirtual(JSC::ConstructData&);84 83 static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&); 85 84
Note: See TracChangeset
for help on using the changeset viewer.