Changeset 87360 in webkit
- Timestamp:
- May 25, 2011 11:15:19 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r87352 r87360 1 2011-05-25 Andreas Kling <kling@webkit.org> 2 3 Reviewed by David Levin. 4 5 Rebaseline run-bindings-tests. 6 https://bugs.webkit.org/show_bug.cgi?id=61469 7 8 * bindings/scripts/test/JS/: 9 * bindings/scripts/test/V8/: 10 1 11 2011-05-25 Levi Weintraub <leviw@chromium.org> 2 12 -
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp
r81799 r87360 86 86 ExecState* exec = m_data->globalObject()->globalExec(); 87 87 MarkedArgumentBuffer args; 88 args.append(toJS(exec, class1Param));88 args.append(toJS(exec, m_data->globalObject(), class1Param)); 89 89 90 90 bool raisedException = false; … … 104 104 ExecState* exec = m_data->globalObject()->globalExec(); 105 105 MarkedArgumentBuffer args; 106 args.append(toJS(exec, class2Param));106 args.append(toJS(exec, m_data->globalObject(), class2Param)); 107 107 args.append(jsString(exec, strArg)); 108 108 … … 123 123 ExecState* exec = m_data->globalObject()->globalExec(); 124 124 MarkedArgumentBuffer args; 125 args.append(toJS(exec, listParam));125 args.append(toJS(exec, m_data->globalObject(), listParam)); 126 126 127 127 bool raisedException = false; -
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp
r81789 r87360 65 65 class JSTestInterfaceConstructor : public DOMConstructorObject { 66 66 public: 67 JSTestInterfaceConstructor(JSC::ExecState*, JS DOMGlobalObject*);67 JSTestInterfaceConstructor(JSC::ExecState*, JSC::Structure*, JSDOMGlobalObject*); 68 68 69 69 virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); 70 70 virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&); 71 71 static const JSC::ClassInfo s_info; 72 static PassRefPtr<JSC::Structure>createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)72 static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype) 73 73 { 74 74 return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); … … 82 82 const ClassInfo JSTestInterfaceConstructor::s_info = { "TestInterfaceConstructor", &DOMConstructorObject::s_info, &JSTestInterfaceConstructorTable, 0 }; 83 83 84 JSTestInterfaceConstructor::JSTestInterfaceConstructor(ExecState* exec, JSDOMGlobalObject* globalObject)85 : DOMConstructorObject( JSTestInterfaceConstructor::createStructure(globalObject->globalData(), globalObject->objectPrototype()), globalObject)84 JSTestInterfaceConstructor::JSTestInterfaceConstructor(ExecState* exec, Structure* structure, JSDOMGlobalObject* globalObject) 85 : DOMConstructorObject(structure, globalObject) 86 86 { 87 87 ASSERT(inherits(&s_info)); … … 91 91 bool JSTestInterfaceConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) 92 92 { 93 return getStaticValueSlot<JSTestInterfaceConstructor, DOMObject>(exec, &JSTestInterfaceConstructorTable, this, propertyName, slot);93 return getStaticValueSlot<JSTestInterfaceConstructor, JSDOMWrapper>(exec, &JSTestInterfaceConstructorTable, this, propertyName, slot); 94 94 } 95 95 96 96 bool JSTestInterfaceConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor) 97 97 { 98 return getStaticValueDescriptor<JSTestInterfaceConstructor, DOMObject>(exec, &JSTestInterfaceConstructorTable, this, propertyName, descriptor);98 return getStaticValueDescriptor<JSTestInterfaceConstructor, JSDOMWrapper>(exec, &JSTestInterfaceConstructorTable, this, propertyName, descriptor); 99 99 } 100 100 … … 134 134 } 135 135 136 const ClassInfo JSTestInterface::s_info = { "TestInterface", & DOMObjectWithGlobalPointer::s_info, &JSTestInterfaceTable, 0 };136 const ClassInfo JSTestInterface::s_info = { "TestInterface", &JSDOMWrapper::s_info, &JSTestInterfaceTable, 0 }; 137 137 138 JSTestInterface::JSTestInterface( NonNullPassRefPtr<Structure>structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestInterface> impl)139 : DOMObjectWithGlobalPointer(structure, globalObject)138 JSTestInterface::JSTestInterface(Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestInterface> impl) 139 : JSDOMWrapper(structure, globalObject) 140 140 , m_impl(impl) 141 141 { … … 145 145 JSObject* JSTestInterface::createPrototype(ExecState* exec, JSGlobalObject* globalObject) 146 146 { 147 return new (exec) JSTestInterfacePrototype( globalObject, JSTestInterfacePrototype::createStructure(globalObject->globalData(), globalObject->objectPrototype()));147 return new (exec) JSTestInterfacePrototype(exec->globalData(), globalObject, JSTestInterfacePrototype::createStructure(globalObject->globalData(), globalObject->objectPrototype())); 148 148 } 149 149 150 150 bool JSTestInterface::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) 151 151 { 152 ASSERT_GC_OBJECT_INHERITS(this, &s_info); 152 153 return getStaticValueSlot<JSTestInterface, Base>(exec, &JSTestInterfaceTable, this, propertyName, slot); 153 154 } … … 155 156 bool JSTestInterface::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor) 156 157 { 158 ASSERT_GC_OBJECT_INHERITS(this, &s_info); 157 159 return getStaticValueDescriptor<JSTestInterface, Base>(exec, &JSTestInterfaceTable, this, propertyName, descriptor); 158 160 } … … 169 171 } 170 172 171 JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestInterface* object)173 JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestInterface* impl) 172 174 { 173 return getDOMObjectWrapper<JSTestInterface>(exec, globalObject, object);175 return wrap<JSTestInterface>(exec, globalObject, impl); 174 176 } 177 175 178 TestInterface* toTestInterface(JSC::JSValue value) 176 179 { -
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h
r81789 r87360 33 33 class TestInterface; 34 34 35 class JSTestInterface : public DOMObjectWithGlobalPointer {36 typedef DOMObjectWithGlobalPointer Base;35 class JSTestInterface : public JSDOMWrapper { 36 typedef JSDOMWrapper Base; 37 37 public: 38 JSTestInterface( NonNullPassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<TestInterface>);38 JSTestInterface(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<TestInterface>); 39 39 static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); 40 40 virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); … … 42 42 static const JSC::ClassInfo s_info; 43 43 44 static PassRefPtr<JSC::Structure>createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)44 static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype) 45 45 { 46 46 return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); … … 64 64 static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); 65 65 static const JSC::ClassInfo s_info; 66 static PassRefPtr<JSC::Structure>createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)66 static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype) 67 67 { 68 68 return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); 69 69 } 70 JSTestInterfacePrototype(JSC::JSGlobal Object* globalObject, NonNullPassRefPtr<JSC::Structure> structure) : JSC::JSObjectWithGlobalObject(globalObject, structure) { }70 JSTestInterfacePrototype(JSC::JSGlobalData& globalData, JSC::JSGlobalObject* globalObject, JSC::Structure* structure) : JSC::JSObjectWithGlobalObject(globalData, globalObject, structure) { } 71 71 protected: 72 72 static const unsigned StructureFlags = Base::StructureFlags; -
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp
r81789 r87360 66 66 class JSTestMediaQueryListListenerConstructor : public DOMConstructorObject { 67 67 public: 68 JSTestMediaQueryListListenerConstructor(JSC::ExecState*, JS DOMGlobalObject*);68 JSTestMediaQueryListListenerConstructor(JSC::ExecState*, JSC::Structure*, JSDOMGlobalObject*); 69 69 70 70 virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); 71 71 virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&); 72 72 static const JSC::ClassInfo s_info; 73 static PassRefPtr<JSC::Structure>createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)73 static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype) 74 74 { 75 75 return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); … … 81 81 const ClassInfo JSTestMediaQueryListListenerConstructor::s_info = { "TestMediaQueryListListenerConstructor", &DOMConstructorObject::s_info, &JSTestMediaQueryListListenerConstructorTable, 0 }; 82 82 83 JSTestMediaQueryListListenerConstructor::JSTestMediaQueryListListenerConstructor(ExecState* exec, JSDOMGlobalObject* globalObject)84 : DOMConstructorObject( JSTestMediaQueryListListenerConstructor::createStructure(globalObject->globalData(), globalObject->objectPrototype()), globalObject)83 JSTestMediaQueryListListenerConstructor::JSTestMediaQueryListListenerConstructor(ExecState* exec, Structure* structure, JSDOMGlobalObject* globalObject) 84 : DOMConstructorObject(structure, globalObject) 85 85 { 86 86 ASSERT(inherits(&s_info)); … … 90 90 bool JSTestMediaQueryListListenerConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) 91 91 { 92 return getStaticValueSlot<JSTestMediaQueryListListenerConstructor, DOMObject>(exec, &JSTestMediaQueryListListenerConstructorTable, this, propertyName, slot);92 return getStaticValueSlot<JSTestMediaQueryListListenerConstructor, JSDOMWrapper>(exec, &JSTestMediaQueryListListenerConstructorTable, this, propertyName, slot); 93 93 } 94 94 95 95 bool JSTestMediaQueryListListenerConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor) 96 96 { 97 return getStaticValueDescriptor<JSTestMediaQueryListListenerConstructor, DOMObject>(exec, &JSTestMediaQueryListListenerConstructorTable, this, propertyName, descriptor);97 return getStaticValueDescriptor<JSTestMediaQueryListListenerConstructor, JSDOMWrapper>(exec, &JSTestMediaQueryListListenerConstructorTable, this, propertyName, descriptor); 98 98 } 99 99 … … 130 130 } 131 131 132 const ClassInfo JSTestMediaQueryListListener::s_info = { "TestMediaQueryListListener", & DOMObjectWithGlobalPointer::s_info, &JSTestMediaQueryListListenerTable, 0 };132 const ClassInfo JSTestMediaQueryListListener::s_info = { "TestMediaQueryListListener", &JSDOMWrapper::s_info, &JSTestMediaQueryListListenerTable, 0 }; 133 133 134 JSTestMediaQueryListListener::JSTestMediaQueryListListener( NonNullPassRefPtr<Structure>structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestMediaQueryListListener> impl)135 : DOMObjectWithGlobalPointer(structure, globalObject)134 JSTestMediaQueryListListener::JSTestMediaQueryListListener(Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestMediaQueryListListener> impl) 135 : JSDOMWrapper(structure, globalObject) 136 136 , m_impl(impl) 137 137 { … … 141 141 JSObject* JSTestMediaQueryListListener::createPrototype(ExecState* exec, JSGlobalObject* globalObject) 142 142 { 143 return new (exec) JSTestMediaQueryListListenerPrototype( globalObject, JSTestMediaQueryListListenerPrototype::createStructure(globalObject->globalData(), globalObject->objectPrototype()));143 return new (exec) JSTestMediaQueryListListenerPrototype(exec->globalData(), globalObject, JSTestMediaQueryListListenerPrototype::createStructure(globalObject->globalData(), globalObject->objectPrototype())); 144 144 } 145 145 146 146 bool JSTestMediaQueryListListener::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) 147 147 { 148 ASSERT_GC_OBJECT_INHERITS(this, &s_info); 148 149 return getStaticValueSlot<JSTestMediaQueryListListener, Base>(exec, &JSTestMediaQueryListListenerTable, this, propertyName, slot); 149 150 } … … 151 152 bool JSTestMediaQueryListListener::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor) 152 153 { 154 ASSERT_GC_OBJECT_INHERITS(this, &s_info); 153 155 return getStaticValueDescriptor<JSTestMediaQueryListListener, Base>(exec, &JSTestMediaQueryListListenerTable, this, propertyName, descriptor); 154 156 } … … 171 173 return throwVMTypeError(exec); 172 174 JSTestMediaQueryListListener* castedThis = static_cast<JSTestMediaQueryListListener*>(asObject(thisValue)); 175 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestMediaQueryListListener::s_info); 173 176 TestMediaQueryListListener* imp = static_cast<TestMediaQueryListListener*>(castedThis->impl()); 174 177 RefPtr<MediaQueryListListener> listener(MediaQueryListListener::create(ScriptValue(exec->globalData(), exec->argument(0)))); … … 180 183 } 181 184 182 JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestMediaQueryListListener* object)185 JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestMediaQueryListListener* impl) 183 186 { 184 return getDOMObjectWrapper<JSTestMediaQueryListListener>(exec, globalObject, object);187 return wrap<JSTestMediaQueryListListener>(exec, globalObject, impl); 185 188 } 189 186 190 TestMediaQueryListListener* toTestMediaQueryListListener(JSC::JSValue value) 187 191 { -
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h
r81789 r87360 31 31 class TestMediaQueryListListener; 32 32 33 class JSTestMediaQueryListListener : public DOMObjectWithGlobalPointer {34 typedef DOMObjectWithGlobalPointer Base;33 class JSTestMediaQueryListListener : public JSDOMWrapper { 34 typedef JSDOMWrapper Base; 35 35 public: 36 JSTestMediaQueryListListener( NonNullPassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<TestMediaQueryListListener>);36 JSTestMediaQueryListListener(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<TestMediaQueryListListener>); 37 37 static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); 38 38 virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); … … 40 40 static const JSC::ClassInfo s_info; 41 41 42 static PassRefPtr<JSC::Structure>createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)42 static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype) 43 43 { 44 44 return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); … … 64 64 virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); 65 65 virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&); 66 static PassRefPtr<JSC::Structure>createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)66 static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype) 67 67 { 68 68 return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); 69 69 } 70 JSTestMediaQueryListListenerPrototype(JSC::JSGlobal Object* globalObject, NonNullPassRefPtr<JSC::Structure> structure) : JSC::JSObjectWithGlobalObject(globalObject, structure) { }70 JSTestMediaQueryListListenerPrototype(JSC::JSGlobalData& globalData, JSC::JSGlobalObject* globalObject, JSC::Structure* structure) : JSC::JSObjectWithGlobalObject(globalData, globalObject, structure) { } 71 71 protected: 72 72 static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags; -
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
r81789 r87360 39 39 #include "TestObj.h" 40 40 #include <runtime/Error.h> 41 #include <runtime/JSNumberCell.h>42 41 #include <runtime/JSString.h> 43 42 #include <wtf/GetPtr.h> … … 145 144 class JSTestObjConstructor : public DOMConstructorObject { 146 145 public: 147 JSTestObjConstructor(JSC::ExecState*, JS DOMGlobalObject*);146 JSTestObjConstructor(JSC::ExecState*, JSC::Structure*, JSDOMGlobalObject*); 148 147 149 148 virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); 150 149 virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&); 151 150 static const JSC::ClassInfo s_info; 152 static PassRefPtr<JSC::Structure>createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)151 static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype) 153 152 { 154 153 return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); … … 160 159 const ClassInfo JSTestObjConstructor::s_info = { "TestObjConstructor", &DOMConstructorObject::s_info, &JSTestObjConstructorTable, 0 }; 161 160 162 JSTestObjConstructor::JSTestObjConstructor(ExecState* exec, JSDOMGlobalObject* globalObject)163 : DOMConstructorObject( JSTestObjConstructor::createStructure(globalObject->globalData(), globalObject->objectPrototype()), globalObject)161 JSTestObjConstructor::JSTestObjConstructor(ExecState* exec, Structure* structure, JSDOMGlobalObject* globalObject) 162 : DOMConstructorObject(structure, globalObject) 164 163 { 165 164 ASSERT(inherits(&s_info)); … … 169 168 bool JSTestObjConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) 170 169 { 171 return getStaticValueSlot<JSTestObjConstructor, DOMObject>(exec, &JSTestObjConstructorTable, this, propertyName, slot);170 return getStaticValueSlot<JSTestObjConstructor, JSDOMWrapper>(exec, &JSTestObjConstructorTable, this, propertyName, slot); 172 171 } 173 172 174 173 bool JSTestObjConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor) 175 174 { 176 return getStaticValueDescriptor<JSTestObjConstructor, DOMObject>(exec, &JSTestObjConstructorTable, this, propertyName, descriptor);175 return getStaticValueDescriptor<JSTestObjConstructor, JSDOMWrapper>(exec, &JSTestObjConstructorTable, this, propertyName, descriptor); 177 176 } 178 177 … … 255 254 } 256 255 257 const ClassInfo JSTestObj::s_info = { "TestObj", & DOMObjectWithGlobalPointer::s_info, &JSTestObjTable, 0 };258 259 JSTestObj::JSTestObj( NonNullPassRefPtr<Structure>structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestObj> impl)260 : DOMObjectWithGlobalPointer(structure, globalObject)256 const ClassInfo JSTestObj::s_info = { "TestObj", &JSDOMWrapper::s_info, &JSTestObjTable, 0 }; 257 258 JSTestObj::JSTestObj(Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestObj> impl) 259 : JSDOMWrapper(structure, globalObject) 261 260 , m_impl(impl) 262 261 { … … 266 265 JSObject* JSTestObj::createPrototype(ExecState* exec, JSGlobalObject* globalObject) 267 266 { 268 return new (exec) JSTestObjPrototype( globalObject, JSTestObjPrototype::createStructure(globalObject->globalData(), globalObject->objectPrototype()));267 return new (exec) JSTestObjPrototype(exec->globalData(), globalObject, JSTestObjPrototype::createStructure(globalObject->globalData(), globalObject->objectPrototype())); 269 268 } 270 269 271 270 bool JSTestObj::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) 272 271 { 272 ASSERT_GC_OBJECT_INHERITS(this, &s_info); 273 273 return getStaticValueSlot<JSTestObj, Base>(exec, &JSTestObjTable, this, propertyName, slot); 274 274 } … … 276 276 bool JSTestObj::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor) 277 277 { 278 ASSERT_GC_OBJECT_INHERITS(this, &s_info); 278 279 return getStaticValueDescriptor<JSTestObj, Base>(exec, &JSTestObjTable, this, propertyName, descriptor); 279 280 } … … 288 289 } 289 290 291 290 292 JSValue jsTestObjReadOnlyStringAttr(ExecState* exec, JSValue slotBase, const Identifier&) 291 293 { … … 297 299 } 298 300 301 299 302 JSValue jsTestObjReadOnlyTestObjAttr(ExecState* exec, JSValue slotBase, const Identifier&) 300 303 { … … 306 309 } 307 310 311 308 312 JSValue jsTestObjShortAttr(ExecState* exec, JSValue slotBase, const Identifier&) 309 313 { … … 315 319 } 316 320 321 317 322 JSValue jsTestObjUnsignedShortAttr(ExecState* exec, JSValue slotBase, const Identifier&) 318 323 { … … 324 329 } 325 330 331 326 332 JSValue jsTestObjIntAttr(ExecState* exec, JSValue slotBase, const Identifier&) 327 333 { … … 333 339 } 334 340 341 335 342 JSValue jsTestObjLongLongAttr(ExecState* exec, JSValue slotBase, const Identifier&) 336 343 { … … 342 349 } 343 350 351 344 352 JSValue jsTestObjUnsignedLongLongAttr(ExecState* exec, JSValue slotBase, const Identifier&) 345 353 { … … 351 359 } 352 360 361 353 362 JSValue jsTestObjStringAttr(ExecState* exec, JSValue slotBase, const Identifier&) 354 363 { … … 360 369 } 361 370 371 362 372 JSValue jsTestObjTestObjAttr(ExecState* exec, JSValue slotBase, const Identifier&) 363 373 { … … 369 379 } 370 380 381 371 382 JSValue jsTestObjXMLObjAttr(ExecState* exec, JSValue slotBase, const Identifier&) 372 383 { … … 378 389 } 379 390 391 380 392 JSValue jsTestObjCreate(ExecState* exec, JSValue slotBase, const Identifier&) 381 393 { … … 387 399 } 388 400 401 389 402 JSValue jsTestObjReflectedStringAttr(ExecState* exec, JSValue slotBase, const Identifier&) 390 403 { … … 396 409 } 397 410 411 398 412 JSValue jsTestObjReflectedIntegralAttr(ExecState* exec, JSValue slotBase, const Identifier&) 399 413 { … … 405 419 } 406 420 421 407 422 JSValue jsTestObjReflectedUnsignedIntegralAttr(ExecState* exec, JSValue slotBase, const Identifier&) 408 423 { … … 414 429 } 415 430 431 416 432 JSValue jsTestObjReflectedBooleanAttr(ExecState* exec, JSValue slotBase, const Identifier&) 417 433 { … … 423 439 } 424 440 441 425 442 JSValue jsTestObjReflectedURLAttr(ExecState* exec, JSValue slotBase, const Identifier&) 426 443 { … … 432 449 } 433 450 451 434 452 JSValue jsTestObjReflectedNonEmptyURLAttr(ExecState* exec, JSValue slotBase, const Identifier&) 435 453 { … … 441 459 } 442 460 461 443 462 JSValue jsTestObjReflectedStringAttr(ExecState* exec, JSValue slotBase, const Identifier&) 444 463 { … … 450 469 } 451 470 471 452 472 JSValue jsTestObjReflectedCustomIntegralAttr(ExecState* exec, JSValue slotBase, const Identifier&) 453 473 { … … 459 479 } 460 480 481 461 482 JSValue jsTestObjReflectedCustomBooleanAttr(ExecState* exec, JSValue slotBase, const Identifier&) 462 483 { … … 468 489 } 469 490 491 470 492 JSValue jsTestObjReflectedCustomURLAttr(ExecState* exec, JSValue slotBase, const Identifier&) 471 493 { … … 477 499 } 478 500 501 479 502 JSValue jsTestObjReflectedCustomNonEmptyURLAttr(ExecState* exec, JSValue slotBase, const Identifier&) 480 503 { … … 485 508 return result; 486 509 } 510 487 511 488 512 JSValue jsTestObjAttrWithGetterException(ExecState* exec, JSValue slotBase, const Identifier&) … … 496 520 } 497 521 522 498 523 JSValue jsTestObjAttrWithSetterException(ExecState* exec, JSValue slotBase, const Identifier&) 499 524 { … … 504 529 return result; 505 530 } 531 506 532 507 533 JSValue jsTestObjStringAttrWithGetterException(ExecState* exec, JSValue slotBase, const Identifier&) … … 515 541 } 516 542 543 517 544 JSValue jsTestObjStringAttrWithSetterException(ExecState* exec, JSValue slotBase, const Identifier&) 518 545 { … … 524 551 } 525 552 553 526 554 JSValue jsTestObjCustomAttr(ExecState* exec, JSValue slotBase, const Identifier&) 527 555 { … … 530 558 } 531 559 560 532 561 JSValue jsTestObjScriptStringAttr(ExecState* exec, JSValue slotBase, const Identifier&) 533 562 { … … 538 567 return result; 539 568 } 569 540 570 541 571 #if ENABLE(Condition1) … … 548 578 return result; 549 579 } 580 550 581 #endif 551 582 … … 559 590 return result; 560 591 } 592 561 593 #endif 562 594 … … 570 602 return result; 571 603 } 604 572 605 #endif 573 606 … … 581 614 } 582 615 616 583 617 JSValue jsTestObjId(ExecState* exec, JSValue slotBase, const Identifier&) 584 618 { … … 590 624 } 591 625 626 592 627 JSValue jsTestObjHash(ExecState* exec, JSValue slotBase, const Identifier&) 593 628 { … … 598 633 return result; 599 634 } 635 600 636 601 637 JSValue jsTestObjConstructor(ExecState* exec, JSValue slotBase, const Identifier&) … … 607 643 void JSTestObj::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot) 608 644 { 645 ASSERT_GC_OBJECT_INHERITS(this, &s_info); 609 646 lookupPut<JSTestObj, Base>(exec, propertyName, value, &JSTestObjTable, this, slot); 610 647 } … … 617 654 } 618 655 656 619 657 void setJSTestObjUnsignedShortAttr(ExecState* exec, JSObject* thisObject, JSValue value) 620 658 { … … 624 662 } 625 663 664 626 665 void setJSTestObjIntAttr(ExecState* exec, JSObject* thisObject, JSValue value) 627 666 { … … 631 670 } 632 671 672 633 673 void setJSTestObjLongLongAttr(ExecState* exec, JSObject* thisObject, JSValue value) 634 674 { … … 638 678 } 639 679 680 640 681 void setJSTestObjUnsignedLongLongAttr(ExecState* exec, JSObject* thisObject, JSValue value) 641 682 { … … 645 686 } 646 687 688 647 689 void setJSTestObjStringAttr(ExecState* exec, JSObject* thisObject, JSValue value) 648 690 { … … 652 694 } 653 695 696 654 697 void setJSTestObjTestObjAttr(ExecState* exec, JSObject* thisObject, JSValue value) 655 698 { … … 659 702 } 660 703 704 661 705 void setJSTestObjXMLObjAttr(ExecState* exec, JSObject* thisObject, JSValue value) 662 706 { … … 666 710 } 667 711 712 668 713 void setJSTestObjCreate(ExecState* exec, JSObject* thisObject, JSValue value) 669 714 { … … 673 718 } 674 719 720 675 721 void setJSTestObjReflectedStringAttr(ExecState* exec, JSObject* thisObject, JSValue value) 676 722 { … … 680 726 } 681 727 728 682 729 void setJSTestObjReflectedIntegralAttr(ExecState* exec, JSObject* thisObject, JSValue value) 683 730 { … … 687 734 } 688 735 736 689 737 void setJSTestObjReflectedUnsignedIntegralAttr(ExecState* exec, JSObject* thisObject, JSValue value) 690 738 { … … 694 742 } 695 743 744 696 745 void setJSTestObjReflectedBooleanAttr(ExecState* exec, JSObject* thisObject, JSValue value) 697 746 { … … 701 750 } 702 751 752 703 753 void setJSTestObjReflectedURLAttr(ExecState* exec, JSObject* thisObject, JSValue value) 704 754 { … … 708 758 } 709 759 760 710 761 void setJSTestObjReflectedNonEmptyURLAttr(ExecState* exec, JSObject* thisObject, JSValue value) 711 762 { … … 715 766 } 716 767 768 717 769 void setJSTestObjReflectedStringAttr(ExecState* exec, JSObject* thisObject, JSValue value) 718 770 { … … 722 774 } 723 775 776 724 777 void setJSTestObjReflectedCustomIntegralAttr(ExecState* exec, JSObject* thisObject, JSValue value) 725 778 { … … 729 782 } 730 783 784 731 785 void setJSTestObjReflectedCustomBooleanAttr(ExecState* exec, JSObject* thisObject, JSValue value) 732 786 { … … 736 790 } 737 791 792 738 793 void setJSTestObjReflectedCustomURLAttr(ExecState* exec, JSObject* thisObject, JSValue value) 739 794 { … … 743 798 } 744 799 800 745 801 void setJSTestObjReflectedCustomNonEmptyURLAttr(ExecState* exec, JSObject* thisObject, JSValue value) 746 802 { … … 749 805 imp->setAttribute(WebCore::HTMLNames::customContentNonEmptyURLAttrAttr, valueToStringWithNullCheck(exec, value)); 750 806 } 807 751 808 752 809 void setJSTestObjAttrWithGetterException(ExecState* exec, JSObject* thisObject, JSValue value) … … 759 816 } 760 817 818 761 819 void setJSTestObjAttrWithSetterException(ExecState* exec, JSObject* thisObject, JSValue value) 762 820 { … … 768 826 } 769 827 828 770 829 void setJSTestObjStringAttrWithGetterException(ExecState* exec, JSObject* thisObject, JSValue value) 771 830 { … … 777 836 } 778 837 838 779 839 void setJSTestObjStringAttrWithSetterException(ExecState* exec, JSObject* thisObject, JSValue value) 780 840 { … … 786 846 } 787 847 848 788 849 void setJSTestObjCustomAttr(ExecState* exec, JSObject* thisObject, JSValue value) 789 850 { 790 851 static_cast<JSTestObj*>(thisObject)->setCustomAttr(exec, value); 791 852 } 853 792 854 793 855 #if ENABLE(Condition1) … … 798 860 imp->setConditionalAttr1(value.toInt32(exec)); 799 861 } 862 800 863 #endif 801 864 … … 807 870 imp->setConditionalAttr2(value.toInt32(exec)); 808 871 } 872 809 873 #endif 810 874 … … 816 880 imp->setConditionalAttr3(value.toInt32(exec)); 817 881 } 882 818 883 #endif 819 884 … … 825 890 } 826 891 892 827 893 JSValue JSTestObj::getConstructor(ExecState* exec, JSGlobalObject* globalObject) 828 894 { … … 836 902 return throwVMTypeError(exec); 837 903 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 904 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 838 905 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 839 906 … … 848 915 return throwVMTypeError(exec); 849 916 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 917 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 850 918 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 851 919 int intArg(exec->argument(0).toInt32(exec)); … … 869 937 return throwVMTypeError(exec); 870 938 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 939 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 871 940 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 872 941 … … 882 951 return throwVMTypeError(exec); 883 952 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 953 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 884 954 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 885 955 int intArg(exec->argument(0).toInt32(exec)); … … 904 974 return throwVMTypeError(exec); 905 975 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 976 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 906 977 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 907 978 … … 917 988 return throwVMTypeError(exec); 918 989 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 990 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 919 991 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 920 992 int intArg(exec->argument(0).toInt32(exec)); … … 939 1011 return throwVMTypeError(exec); 940 1012 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1013 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 941 1014 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 942 1015 if (exec->argumentCount() < 2) … … 960 1033 return throwVMTypeError(exec); 961 1034 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1035 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 962 1036 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 963 1037 if (exec->argumentCount() < 2) … … 983 1057 return throwVMTypeError(exec); 984 1058 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1059 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 985 1060 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 986 1061 RefPtr<SerializedScriptValue> serializedArg(SerializedScriptValue::create(exec, exec->argument(0))); … … 998 1073 return throwVMTypeError(exec); 999 1074 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1075 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1000 1076 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1001 1077 RefPtr<IDBKey> key(createIDBKeyFromValue(exec, exec->argument(0))); … … 1013 1089 return throwVMTypeError(exec); 1014 1090 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1091 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1015 1092 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1016 1093 OptionsObject* oo(toOptionsObject(exec->argument(0))); … … 1038 1115 return throwVMTypeError(exec); 1039 1116 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1117 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1040 1118 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1041 1119 ExceptionCode ec = 0; … … 1052 1130 return throwVMTypeError(exec); 1053 1131 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1132 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1054 1133 return JSValue::encode(castedThis->customMethod(exec)); 1055 1134 } … … 1061 1140 return throwVMTypeError(exec); 1062 1141 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1142 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1063 1143 return JSValue::encode(castedThis->customMethodWithArgs(exec)); 1064 1144 } … … 1070 1150 return throwVMTypeError(exec); 1071 1151 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1152 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1072 1153 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1073 1154 ExceptionCode ec = 0; … … 1090 1171 return throwVMTypeError(exec); 1091 1172 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1173 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1092 1174 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1093 1175 JSValue listener = exec->argument(1); … … 1104 1186 return throwVMTypeError(exec); 1105 1187 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1188 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1106 1189 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1107 1190 JSValue listener = exec->argument(1); … … 1118 1201 return throwVMTypeError(exec); 1119 1202 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1203 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1120 1204 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1121 1205 Frame* dynamicFrame = toDynamicFrame(exec); … … 1133 1217 return throwVMTypeError(exec); 1134 1218 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1219 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1135 1220 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1136 1221 Frame* dynamicFrame = toDynamicFrame(exec); … … 1151 1236 return throwVMTypeError(exec); 1152 1237 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1238 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1153 1239 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1154 1240 Frame* dynamicFrame = toDynamicFrame(exec); … … 1179 1265 return throwVMTypeError(exec); 1180 1266 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1267 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1181 1268 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1182 1269 Frame* dynamicFrame = toDynamicFrame(exec); … … 1197 1284 return throwVMTypeError(exec); 1198 1285 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1286 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1199 1287 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1200 1288 Frame* dynamicFrame = toDynamicFrame(exec); … … 1225 1313 return throwVMTypeError(exec); 1226 1314 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1315 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1227 1316 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1228 1317 … … 1237 1326 return throwVMTypeError(exec); 1238 1327 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1328 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1239 1329 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1240 1330 … … 1252 1342 return throwVMTypeError(exec); 1253 1343 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1344 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1254 1345 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1255 1346 ExceptionCode ec = 0; … … 1266 1357 return throwVMTypeError(exec); 1267 1358 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1359 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1268 1360 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1269 1361 ExceptionCode ec = 0; … … 1283 1375 return throwVMTypeError(exec); 1284 1376 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1377 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1285 1378 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1286 1379 ScriptExecutionContext* scriptContext = static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext(); … … 1298 1391 return throwVMTypeError(exec); 1299 1392 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1393 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1300 1394 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1301 1395 … … 1320 1414 return throwVMTypeError(exec); 1321 1415 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1416 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1322 1417 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1323 1418 int nonOpt(exec->argument(0).toInt32(exec)); … … 1345 1440 return throwVMTypeError(exec); 1346 1441 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1442 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1347 1443 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1348 1444 int nonOpt(exec->argument(0).toInt32(exec)); … … 1373 1469 return throwVMTypeError(exec); 1374 1470 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1471 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1375 1472 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1376 1473 if (exec->argumentCount() <= 0 || !exec->argument(0).isObject()) { … … 1390 1487 return throwVMTypeError(exec); 1391 1488 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1489 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1392 1490 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1393 1491 int nonCallback(exec->argument(0).toInt32(exec)); … … 1410 1508 return throwVMTypeError(exec); 1411 1509 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1510 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1412 1511 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1413 1512 RefPtr<TestCallback> callback; … … 1430 1529 return throwVMTypeError(exec); 1431 1530 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1531 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1432 1532 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1433 1533 TestObj* objArg(toTestObj(exec->argument(0))); … … 1448 1548 return throwVMTypeError(exec); 1449 1549 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1550 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1450 1551 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1451 1552 TestObj* objArg(toTestObj(exec->argument(0))); … … 1473 1574 return throwVMTypeError(exec); 1474 1575 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1576 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1475 1577 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1476 1578 const String& strArg(ustringToString(exec->argument(0).toString(exec))); … … 1488 1590 return throwVMTypeError(exec); 1489 1591 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1592 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1490 1593 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1491 1594 int intArg(exec->argument(0).toInt32(exec)); … … 1503 1606 return throwVMTypeError(exec); 1504 1607 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1608 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1505 1609 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1506 1610 if (exec->argumentCount() <= 0 || !exec->argument(0).isObject()) { … … 1535 1639 return throwVMTypeError(exec); 1536 1640 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1641 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1537 1642 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1538 1643 … … 1547 1652 return throwVMTypeError(exec); 1548 1653 JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue)); 1654 ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info); 1549 1655 TestObj* imp = static_cast<TestObj*>(castedThis->impl()); 1550 1656 … … 1632 1738 } 1633 1739 1634 JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestObj* object) 1635 { 1636 return getDOMObjectWrapper<JSTestObj>(exec, globalObject, object); 1637 } 1740 JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestObj* impl) 1741 { 1742 return wrap<JSTestObj>(exec, globalObject, impl); 1743 } 1744 1638 1745 TestObj* toTestObj(JSC::JSValue value) 1639 1746 { -
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h
r81789 r87360 31 31 class TestObj; 32 32 33 class JSTestObj : public DOMObjectWithGlobalPointer {34 typedef DOMObjectWithGlobalPointer Base;33 class JSTestObj : public JSDOMWrapper { 34 typedef JSDOMWrapper Base; 35 35 public: 36 JSTestObj( NonNullPassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<TestObj>);36 JSTestObj(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<TestObj>); 37 37 static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); 38 38 virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); … … 41 41 static const JSC::ClassInfo s_info; 42 42 43 static PassRefPtr<JSC::Structure>createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)43 static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype) 44 44 { 45 45 return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); … … 73 73 virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); 74 74 virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&); 75 static PassRefPtr<JSC::Structure>createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)75 static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype) 76 76 { 77 77 return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); 78 78 } 79 JSTestObjPrototype(JSC::JSGlobal Object* globalObject, NonNullPassRefPtr<JSC::Structure> structure) : JSC::JSObjectWithGlobalObject(globalObject, structure) { }79 JSTestObjPrototype(JSC::JSGlobalData& globalData, JSC::JSGlobalObject* globalObject, JSC::Structure* structure) : JSC::JSObjectWithGlobalObject(globalData, globalObject, structure) { } 80 80 protected: 81 81 static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags; -
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp
r81789 r87360 67 67 class JSTestSerializedScriptValueInterfaceConstructor : public DOMConstructorObject { 68 68 public: 69 JSTestSerializedScriptValueInterfaceConstructor(JSC::ExecState*, JS DOMGlobalObject*);69 JSTestSerializedScriptValueInterfaceConstructor(JSC::ExecState*, JSC::Structure*, JSDOMGlobalObject*); 70 70 71 71 virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&); 72 72 virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&); 73 73 static const JSC::ClassInfo s_info; 74 static PassRefPtr<JSC::Structure>createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)74 static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype) 75 75 { 76 76 return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); … … 82 82 const ClassInfo JSTestSerializedScriptValueInterfaceConstructor::s_info = { "TestSerializedScriptValueInterfaceConstructor", &DOMConstructorObject::s_info, &JSTestSerializedScriptValueInterfaceConstructorTable, 0 }; 83 83 84 JSTestSerializedScriptValueInterfaceConstructor::JSTestSerializedScriptValueInterfaceConstructor(ExecState* exec, JSDOMGlobalObject* globalObject)85 : DOMConstructorObject( JSTestSerializedScriptValueInterfaceConstructor::createStructure(globalObject->globalData(), globalObject->objectPrototype()), globalObject)84 JSTestSerializedScriptValueInterfaceConstructor::JSTestSerializedScriptValueInterfaceConstructor(ExecState* exec, Structure* structure, JSDOMGlobalObject* globalObject) 85 : DOMConstructorObject(structure, globalObject) 86 86 { 87 87 ASSERT(inherits(&s_info)); … … 91 91 bool JSTestSerializedScriptValueInterfaceConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) 92 92 { 93 return getStaticValueSlot<JSTestSerializedScriptValueInterfaceConstructor, DOMObject>(exec, &JSTestSerializedScriptValueInterfaceConstructorTable, this, propertyName, slot);93 return getStaticValueSlot<JSTestSerializedScriptValueInterfaceConstructor, JSDOMWrapper>(exec, &JSTestSerializedScriptValueInterfaceConstructorTable, this, propertyName, slot); 94 94 } 95 95 96 96 bool JSTestSerializedScriptValueInterfaceConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor) 97 97 { 98 return getStaticValueDescriptor<JSTestSerializedScriptValueInterfaceConstructor, DOMObject>(exec, &JSTestSerializedScriptValueInterfaceConstructorTable, this, propertyName, descriptor);98 return getStaticValueDescriptor<JSTestSerializedScriptValueInterfaceConstructor, JSDOMWrapper>(exec, &JSTestSerializedScriptValueInterfaceConstructorTable, this, propertyName, descriptor); 99 99 } 100 100 … … 120 120 } 121 121 122 const ClassInfo JSTestSerializedScriptValueInterface::s_info = { "TestSerializedScriptValueInterface", & DOMObjectWithGlobalPointer::s_info, &JSTestSerializedScriptValueInterfaceTable, 0 };122 const ClassInfo JSTestSerializedScriptValueInterface::s_info = { "TestSerializedScriptValueInterface", &JSDOMWrapper::s_info, &JSTestSerializedScriptValueInterfaceTable, 0 }; 123 123 124 JSTestSerializedScriptValueInterface::JSTestSerializedScriptValueInterface( NonNullPassRefPtr<Structure>structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestSerializedScriptValueInterface> impl)125 : DOMObjectWithGlobalPointer(structure, globalObject)124 JSTestSerializedScriptValueInterface::JSTestSerializedScriptValueInterface(Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestSerializedScriptValueInterface> impl) 125 : JSDOMWrapper(structure, globalObject) 126 126 , m_impl(impl) 127 127 { … … 131 131 JSObject* JSTestSerializedScriptValueInterface::createPrototype(ExecState* exec, JSGlobalObject* globalObject) 132 132 { 133 return new (exec) JSTestSerializedScriptValueInterfacePrototype( globalObject, JSTestSerializedScriptValueInterfacePrototype::createStructure(globalObject->globalData(), globalObject->objectPrototype()));133 return new (exec) JSTestSerializedScriptValueInterfacePrototype(exec->globalData(), globalObject, JSTestSerializedScriptValueInterfacePrototype::createStructure(globalObject->globalData(), globalObject->objectPrototype())); 134 134 } 135 135 136 136 bool JSTestSerializedScriptValueInterface::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot) 137 137 { 138 ASSERT_GC_OBJECT_INHERITS(this, &s_info); 138 139 return getStaticValueSlot<JSTestSerializedScriptValueInterface, Base>(exec, &JSTestSerializedScriptValueInterfaceTable, this, propertyName, slot); 139 140 } … … 141 142 bool JSTestSerializedScriptValueInterface::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor) 142 143 { 144 ASSERT_GC_OBJECT_INHERITS(this, &s_info); 143 145 return getStaticValueDescriptor<JSTestSerializedScriptValueInterface, Base>(exec, &JSTestSerializedScriptValueInterfaceTable, this, propertyName, descriptor); 144 146 } … … 153 155 } 154 156 157 155 158 JSValue jsTestSerializedScriptValueInterfaceConstructor(ExecState* exec, JSValue slotBase, const Identifier&) 156 159 { … … 164 167 } 165 168 166 JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestSerializedScriptValueInterface* object)169 JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestSerializedScriptValueInterface* impl) 167 170 { 168 return getDOMObjectWrapper<JSTestSerializedScriptValueInterface>(exec, globalObject, object);171 return wrap<JSTestSerializedScriptValueInterface>(exec, globalObject, impl); 169 172 } 173 170 174 TestSerializedScriptValueInterface* toTestSerializedScriptValueInterface(JSC::JSValue value) 171 175 { -
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h
r81789 r87360 33 33 class TestSerializedScriptValueInterface; 34 34 35 class JSTestSerializedScriptValueInterface : public DOMObjectWithGlobalPointer {36 typedef DOMObjectWithGlobalPointer Base;35 class JSTestSerializedScriptValueInterface : public JSDOMWrapper { 36 typedef JSDOMWrapper Base; 37 37 public: 38 JSTestSerializedScriptValueInterface( NonNullPassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<TestSerializedScriptValueInterface>);38 JSTestSerializedScriptValueInterface(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<TestSerializedScriptValueInterface>); 39 39 static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*); 40 40 virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&); … … 42 42 static const JSC::ClassInfo s_info; 43 43 44 static PassRefPtr<JSC::Structure>createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)44 static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype) 45 45 { 46 46 return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); … … 64 64 static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*); 65 65 static const JSC::ClassInfo s_info; 66 static PassRefPtr<JSC::Structure>createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)66 static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype) 67 67 { 68 68 return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info); 69 69 } 70 JSTestSerializedScriptValueInterfacePrototype(JSC::JSGlobal Object* globalObject, NonNullPassRefPtr<JSC::Structure> structure) : JSC::JSObjectWithGlobalObject(globalObject, structure) { }70 JSTestSerializedScriptValueInterfacePrototype(JSC::JSGlobalData& globalData, JSC::JSGlobalObject* globalObject, JSC::Structure* structure) : JSC::JSObjectWithGlobalObject(globalData, globalObject, structure) { } 71 71 protected: 72 72 static const unsigned StructureFlags = Base::StructureFlags; -
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp
r87063 r87360 89 89 impl->ref(); 90 90 v8::Persistent<v8::Object> wrapperHandle = v8::Persistent<v8::Object>::New(wrapper); 91 #if !PLATFORM(QT) 92 // FIXME: qtscript-staging's shipped V8 does not have the needed functionality yet. 93 // https://bugs.webkit.org/show_bug.cgi?id=61291 94 91 95 if (!hasDependentLifetime) 92 96 wrapperHandle.MarkIndependent(); 97 #endif 93 98 getDOMObjectMap().set(impl, wrapperHandle); 94 99 return wrapper; -
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp
r87063 r87360 96 96 impl->ref(); 97 97 v8::Persistent<v8::Object> wrapperHandle = v8::Persistent<v8::Object>::New(wrapper); 98 #if !PLATFORM(QT) 99 // FIXME: qtscript-staging's shipped V8 does not have the needed functionality yet. 100 // https://bugs.webkit.org/show_bug.cgi?id=61291 101 98 102 if (!hasDependentLifetime) 99 103 wrapperHandle.MarkIndependent(); 104 #endif 100 105 getDOMObjectMap().set(impl, wrapperHandle); 101 106 return wrapper; -
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp
r87063 r87360 1382 1382 impl->ref(); 1383 1383 v8::Persistent<v8::Object> wrapperHandle = v8::Persistent<v8::Object>::New(wrapper); 1384 #if !PLATFORM(QT) 1385 // FIXME: qtscript-staging's shipped V8 does not have the needed functionality yet. 1386 // https://bugs.webkit.org/show_bug.cgi?id=61291 1387 1384 1388 if (!hasDependentLifetime) 1385 1389 wrapperHandle.MarkIndependent(); 1390 #endif 1386 1391 getDOMObjectMap().set(impl, wrapperHandle); 1387 1392 return wrapper; -
trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp
r87063 r87360 85 85 SerializedScriptValue::deserializeAndSetProperty(wrapper, "value", static_cast<v8::PropertyAttribute>(v8::DontDelete | v8::ReadOnly), impl->value()); 86 86 v8::Persistent<v8::Object> wrapperHandle = v8::Persistent<v8::Object>::New(wrapper); 87 #if !PLATFORM(QT) 88 // FIXME: qtscript-staging's shipped V8 does not have the needed functionality yet. 89 // https://bugs.webkit.org/show_bug.cgi?id=61291 90 87 91 if (!hasDependentLifetime) 88 92 wrapperHandle.MarkIndependent(); 93 #endif 89 94 getDOMObjectMap().set(impl, wrapperHandle); 90 95 return wrapper;
Note: See TracChangeset
for help on using the changeset viewer.