Changeset 87360 in webkit


Ignore:
Timestamp:
May 25, 2011 11:15:19 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-05-25 Andreas Kling <​kling@webkit.org>

Reviewed by David Levin.

Rebaseline run-bindings-tests.
​https://bugs.webkit.org/show_bug.cgi?id=61469

  • bindings/scripts/test/JS/:
  • bindings/scripts/test/V8/:
Location:
trunk/Source/WebCore
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r87352 r87360  
     12011-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
    1112011-05-25  Levi Weintraub  <leviw@chromium.org>
    212

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp

    r81799 r87360  
    8686    ExecState* exec = m_data->globalObject()->globalExec();
    8787    MarkedArgumentBuffer args;
    88     args.append(toJS(exec, class1Param));
     88    args.append(toJS(exec, m_data->globalObject(), class1Param));
    8989
    9090    bool raisedException = false;
    … …  
    104104    ExecState* exec = m_data->globalObject()->globalExec();
    105105    MarkedArgumentBuffer args;
    106     args.append(toJS(exec, class2Param));
     106    args.append(toJS(exec, m_data->globalObject(), class2Param));
    107107    args.append(jsString(exec, strArg));
    108108
    … …  
    123123    ExecState* exec = m_data->globalObject()->globalExec();
    124124    MarkedArgumentBuffer args;
    125     args.append(toJS(exec, listParam));
     125    args.append(toJS(exec, m_data->globalObject(), listParam));
    126126
    127127    bool raisedException = false;

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp

    r81789 r87360  
    6565class JSTestInterfaceConstructor : public DOMConstructorObject {
    6666public:
    67     JSTestInterfaceConstructor(JSC::ExecState*, JSDOMGlobalObject*);
     67    JSTestInterfaceConstructor(JSC::ExecState*, JSC::Structure*, JSDOMGlobalObject*);
    6868
    6969    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);
    7070    virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);
    7171    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)
    7373    {
    7474        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
    … …  
    8282const ClassInfo JSTestInterfaceConstructor::s_info = { "TestInterfaceConstructor", &DOMConstructorObject::s_info, &JSTestInterfaceConstructorTable, 0 };
    8383
    84 JSTestInterfaceConstructor::JSTestInterfaceConstructor(ExecState* exec, JSDOMGlobalObject* globalObject)
    85     : DOMConstructorObject(JSTestInterfaceConstructor::createStructure(globalObject->globalData(), globalObject->objectPrototype()), globalObject)
     84JSTestInterfaceConstructor::JSTestInterfaceConstructor(ExecState* exec, Structure* structure, JSDOMGlobalObject* globalObject)
     85    : DOMConstructorObject(structure, globalObject)
    8686{
    8787    ASSERT(inherits(&s_info));
    … …  
    9191bool JSTestInterfaceConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
    9292{
    93     return getStaticValueSlot<JSTestInterfaceConstructor, DOMObject>(exec, &JSTestInterfaceConstructorTable, this, propertyName, slot);
     93    return getStaticValueSlot<JSTestInterfaceConstructor, JSDOMWrapper>(exec, &JSTestInterfaceConstructorTable, this, propertyName, slot);
    9494}
    9595
    9696bool JSTestInterfaceConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
    9797{
    98     return getStaticValueDescriptor<JSTestInterfaceConstructor, DOMObject>(exec, &JSTestInterfaceConstructorTable, this, propertyName, descriptor);
     98    return getStaticValueDescriptor<JSTestInterfaceConstructor, JSDOMWrapper>(exec, &JSTestInterfaceConstructorTable, this, propertyName, descriptor);
    9999}
    100100
    … …  
    134134}
    135135
    136 const ClassInfo JSTestInterface::s_info = { "TestInterface", &DOMObjectWithGlobalPointer::s_info, &JSTestInterfaceTable, 0 };
     136const ClassInfo JSTestInterface::s_info = { "TestInterface", &JSDOMWrapper::s_info, &JSTestInterfaceTable, 0 };
    137137
    138 JSTestInterface::JSTestInterface(NonNullPassRefPtr<Structure> structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestInterface> impl)
    139     : DOMObjectWithGlobalPointer(structure, globalObject)
     138JSTestInterface::JSTestInterface(Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestInterface> impl)
     139    : JSDOMWrapper(structure, globalObject)
    140140    , m_impl(impl)
    141141{
    … …  
    145145JSObject* JSTestInterface::createPrototype(ExecState* exec, JSGlobalObject* globalObject)
    146146{
    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()));
    148148}
    149149
    150150bool JSTestInterface::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
    151151{
     152    ASSERT_GC_OBJECT_INHERITS(this, &s_info);
    152153    return getStaticValueSlot<JSTestInterface, Base>(exec, &JSTestInterfaceTable, this, propertyName, slot);
    153154}
    … …  
    155156bool JSTestInterface::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
    156157{
     158    ASSERT_GC_OBJECT_INHERITS(this, &s_info);
    157159    return getStaticValueDescriptor<JSTestInterface, Base>(exec, &JSTestInterfaceTable, this, propertyName, descriptor);
    158160}
    … …  
    169171}
    170172
    171 JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestInterface* object)
     173JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestInterface* impl)
    172174{
    173     return getDOMObjectWrapper<JSTestInterface>(exec, globalObject, object);
     175    return wrap<JSTestInterface>(exec, globalObject, impl);
    174176}
     177
    175178TestInterface* toTestInterface(JSC::JSValue value)
    176179{

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h

    r81789 r87360  
    3333class TestInterface;
    3434
    35 class JSTestInterface : public DOMObjectWithGlobalPointer {
    36     typedef DOMObjectWithGlobalPointer Base;
     35class JSTestInterface : public JSDOMWrapper {
     36    typedef JSDOMWrapper Base;
    3737public:
    38     JSTestInterface(NonNullPassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<TestInterface>);
     38    JSTestInterface(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<TestInterface>);
    3939    static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*);
    4040    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&);
    … …  
    4242    static const JSC::ClassInfo s_info;
    4343
    44     static PassRefPtr<JSC::Structure> createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)
     44    static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)
    4545    {
    4646        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
    … …  
    6464    static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*);
    6565    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)
    6767    {
    6868        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
    6969    }
    70     JSTestInterfacePrototype(JSC::JSGlobalObject* 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) { }
    7171protected:
    7272    static const unsigned StructureFlags = Base::StructureFlags;

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp

    r81789 r87360  
    6666class JSTestMediaQueryListListenerConstructor : public DOMConstructorObject {
    6767public:
    68     JSTestMediaQueryListListenerConstructor(JSC::ExecState*, JSDOMGlobalObject*);
     68    JSTestMediaQueryListListenerConstructor(JSC::ExecState*, JSC::Structure*, JSDOMGlobalObject*);
    6969
    7070    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);
    7171    virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);
    7272    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)
    7474    {
    7575        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
    … …  
    8181const ClassInfo JSTestMediaQueryListListenerConstructor::s_info = { "TestMediaQueryListListenerConstructor", &DOMConstructorObject::s_info, &JSTestMediaQueryListListenerConstructorTable, 0 };
    8282
    83 JSTestMediaQueryListListenerConstructor::JSTestMediaQueryListListenerConstructor(ExecState* exec, JSDOMGlobalObject* globalObject)
    84     : DOMConstructorObject(JSTestMediaQueryListListenerConstructor::createStructure(globalObject->globalData(), globalObject->objectPrototype()), globalObject)
     83JSTestMediaQueryListListenerConstructor::JSTestMediaQueryListListenerConstructor(ExecState* exec, Structure* structure, JSDOMGlobalObject* globalObject)
     84    : DOMConstructorObject(structure, globalObject)
    8585{
    8686    ASSERT(inherits(&s_info));
    … …  
    9090bool JSTestMediaQueryListListenerConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
    9191{
    92     return getStaticValueSlot<JSTestMediaQueryListListenerConstructor, DOMObject>(exec, &JSTestMediaQueryListListenerConstructorTable, this, propertyName, slot);
     92    return getStaticValueSlot<JSTestMediaQueryListListenerConstructor, JSDOMWrapper>(exec, &JSTestMediaQueryListListenerConstructorTable, this, propertyName, slot);
    9393}
    9494
    9595bool JSTestMediaQueryListListenerConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
    9696{
    97     return getStaticValueDescriptor<JSTestMediaQueryListListenerConstructor, DOMObject>(exec, &JSTestMediaQueryListListenerConstructorTable, this, propertyName, descriptor);
     97    return getStaticValueDescriptor<JSTestMediaQueryListListenerConstructor, JSDOMWrapper>(exec, &JSTestMediaQueryListListenerConstructorTable, this, propertyName, descriptor);
    9898}
    9999
    … …  
    130130}
    131131
    132 const ClassInfo JSTestMediaQueryListListener::s_info = { "TestMediaQueryListListener", &DOMObjectWithGlobalPointer::s_info, &JSTestMediaQueryListListenerTable, 0 };
     132const ClassInfo JSTestMediaQueryListListener::s_info = { "TestMediaQueryListListener", &JSDOMWrapper::s_info, &JSTestMediaQueryListListenerTable, 0 };
    133133
    134 JSTestMediaQueryListListener::JSTestMediaQueryListListener(NonNullPassRefPtr<Structure> structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestMediaQueryListListener> impl)
    135     : DOMObjectWithGlobalPointer(structure, globalObject)
     134JSTestMediaQueryListListener::JSTestMediaQueryListListener(Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestMediaQueryListListener> impl)
     135    : JSDOMWrapper(structure, globalObject)
    136136    , m_impl(impl)
    137137{
    … …  
    141141JSObject* JSTestMediaQueryListListener::createPrototype(ExecState* exec, JSGlobalObject* globalObject)
    142142{
    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()));
    144144}
    145145
    146146bool JSTestMediaQueryListListener::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
    147147{
     148    ASSERT_GC_OBJECT_INHERITS(this, &s_info);
    148149    return getStaticValueSlot<JSTestMediaQueryListListener, Base>(exec, &JSTestMediaQueryListListenerTable, this, propertyName, slot);
    149150}
    … …  
    151152bool JSTestMediaQueryListListener::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
    152153{
     154    ASSERT_GC_OBJECT_INHERITS(this, &s_info);
    153155    return getStaticValueDescriptor<JSTestMediaQueryListListener, Base>(exec, &JSTestMediaQueryListListenerTable, this, propertyName, descriptor);
    154156}
    … …  
    171173        return throwVMTypeError(exec);
    172174    JSTestMediaQueryListListener* castedThis = static_cast<JSTestMediaQueryListListener*>(asObject(thisValue));
     175    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestMediaQueryListListener::s_info);
    173176    TestMediaQueryListListener* imp = static_cast<TestMediaQueryListListener*>(castedThis->impl());
    174177    RefPtr<MediaQueryListListener> listener(MediaQueryListListener::create(ScriptValue(exec->globalData(), exec->argument(0))));
    … …  
    180183}
    181184
    182 JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestMediaQueryListListener* object)
     185JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestMediaQueryListListener* impl)
    183186{
    184     return getDOMObjectWrapper<JSTestMediaQueryListListener>(exec, globalObject, object);
     187    return wrap<JSTestMediaQueryListListener>(exec, globalObject, impl);
    185188}
     189
    186190TestMediaQueryListListener* toTestMediaQueryListListener(JSC::JSValue value)
    187191{

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h

    r81789 r87360  
    3131class TestMediaQueryListListener;
    3232
    33 class JSTestMediaQueryListListener : public DOMObjectWithGlobalPointer {
    34     typedef DOMObjectWithGlobalPointer Base;
     33class JSTestMediaQueryListListener : public JSDOMWrapper {
     34    typedef JSDOMWrapper Base;
    3535public:
    36     JSTestMediaQueryListListener(NonNullPassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<TestMediaQueryListListener>);
     36    JSTestMediaQueryListListener(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<TestMediaQueryListListener>);
    3737    static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*);
    3838    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&);
    … …  
    4040    static const JSC::ClassInfo s_info;
    4141
    42     static PassRefPtr<JSC::Structure> createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)
     42    static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)
    4343    {
    4444        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
    … …  
    6464    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);
    6565    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)
    6767    {
    6868        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
    6969    }
    70     JSTestMediaQueryListListenerPrototype(JSC::JSGlobalObject* 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) { }
    7171protected:
    7272    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp

    r81789 r87360  
    3939#include "TestObj.h"
    4040#include <runtime/Error.h>
    41 #include <runtime/JSNumberCell.h>
    4241#include <runtime/JSString.h>
    4342#include <wtf/GetPtr.h>
    … …  
    145144class JSTestObjConstructor : public DOMConstructorObject {
    146145public:
    147     JSTestObjConstructor(JSC::ExecState*, JSDOMGlobalObject*);
     146    JSTestObjConstructor(JSC::ExecState*, JSC::Structure*, JSDOMGlobalObject*);
    148147
    149148    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);
    150149    virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);
    151150    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)
    153152    {
    154153        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
    … …  
    160159const ClassInfo JSTestObjConstructor::s_info = { "TestObjConstructor", &DOMConstructorObject::s_info, &JSTestObjConstructorTable, 0 };
    161160
    162 JSTestObjConstructor::JSTestObjConstructor(ExecState* exec, JSDOMGlobalObject* globalObject)
    163     : DOMConstructorObject(JSTestObjConstructor::createStructure(globalObject->globalData(), globalObject->objectPrototype()), globalObject)
     161JSTestObjConstructor::JSTestObjConstructor(ExecState* exec, Structure* structure, JSDOMGlobalObject* globalObject)
     162    : DOMConstructorObject(structure, globalObject)
    164163{
    165164    ASSERT(inherits(&s_info));
    … …  
    169168bool JSTestObjConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
    170169{
    171     return getStaticValueSlot<JSTestObjConstructor, DOMObject>(exec, &JSTestObjConstructorTable, this, propertyName, slot);
     170    return getStaticValueSlot<JSTestObjConstructor, JSDOMWrapper>(exec, &JSTestObjConstructorTable, this, propertyName, slot);
    172171}
    173172
    174173bool JSTestObjConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
    175174{
    176     return getStaticValueDescriptor<JSTestObjConstructor, DOMObject>(exec, &JSTestObjConstructorTable, this, propertyName, descriptor);
     175    return getStaticValueDescriptor<JSTestObjConstructor, JSDOMWrapper>(exec, &JSTestObjConstructorTable, this, propertyName, descriptor);
    177176}
    178177
    … …  
    255254}
    256255
    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)
     256const ClassInfo JSTestObj::s_info = { "TestObj", &JSDOMWrapper::s_info, &JSTestObjTable, 0 };
     257
     258JSTestObj::JSTestObj(Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestObj> impl)
     259    : JSDOMWrapper(structure, globalObject)
    261260    , m_impl(impl)
    262261{
    … …  
    266265JSObject* JSTestObj::createPrototype(ExecState* exec, JSGlobalObject* globalObject)
    267266{
    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()));
    269268}
    270269
    271270bool JSTestObj::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
    272271{
     272    ASSERT_GC_OBJECT_INHERITS(this, &s_info);
    273273    return getStaticValueSlot<JSTestObj, Base>(exec, &JSTestObjTable, this, propertyName, slot);
    274274}
    … …  
    276276bool JSTestObj::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
    277277{
     278    ASSERT_GC_OBJECT_INHERITS(this, &s_info);
    278279    return getStaticValueDescriptor<JSTestObj, Base>(exec, &JSTestObjTable, this, propertyName, descriptor);
    279280}
    … …  
    288289}
    289290
     291
    290292JSValue jsTestObjReadOnlyStringAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    291293{
    … …  
    297299}
    298300
     301
    299302JSValue jsTestObjReadOnlyTestObjAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    300303{
    … …  
    306309}
    307310
     311
    308312JSValue jsTestObjShortAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    309313{
    … …  
    315319}
    316320
     321
    317322JSValue jsTestObjUnsignedShortAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    318323{
    … …  
    324329}
    325330
     331
    326332JSValue jsTestObjIntAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    327333{
    … …  
    333339}
    334340
     341
    335342JSValue jsTestObjLongLongAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    336343{
    … …  
    342349}
    343350
     351
    344352JSValue jsTestObjUnsignedLongLongAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    345353{
    … …  
    351359}
    352360
     361
    353362JSValue jsTestObjStringAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    354363{
    … …  
    360369}
    361370
     371
    362372JSValue jsTestObjTestObjAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    363373{
    … …  
    369379}
    370380
     381
    371382JSValue jsTestObjXMLObjAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    372383{
    … …  
    378389}
    379390
     391
    380392JSValue jsTestObjCreate(ExecState* exec, JSValue slotBase, const Identifier&)
    381393{
    … …  
    387399}
    388400
     401
    389402JSValue jsTestObjReflectedStringAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    390403{
    … …  
    396409}
    397410
     411
    398412JSValue jsTestObjReflectedIntegralAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    399413{
    … …  
    405419}
    406420
     421
    407422JSValue jsTestObjReflectedUnsignedIntegralAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    408423{
    … …  
    414429}
    415430
     431
    416432JSValue jsTestObjReflectedBooleanAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    417433{
    … …  
    423439}
    424440
     441
    425442JSValue jsTestObjReflectedURLAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    426443{
    … …  
    432449}
    433450
     451
    434452JSValue jsTestObjReflectedNonEmptyURLAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    435453{
    … …  
    441459}
    442460
     461
    443462JSValue jsTestObjReflectedStringAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    444463{
    … …  
    450469}
    451470
     471
    452472JSValue jsTestObjReflectedCustomIntegralAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    453473{
    … …  
    459479}
    460480
     481
    461482JSValue jsTestObjReflectedCustomBooleanAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    462483{
    … …  
    468489}
    469490
     491
    470492JSValue jsTestObjReflectedCustomURLAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    471493{
    … …  
    477499}
    478500
     501
    479502JSValue jsTestObjReflectedCustomNonEmptyURLAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    480503{
    … …  
    485508    return result;
    486509}
     510
    487511
    488512JSValue jsTestObjAttrWithGetterException(ExecState* exec, JSValue slotBase, const Identifier&)
    … …  
    496520}
    497521
     522
    498523JSValue jsTestObjAttrWithSetterException(ExecState* exec, JSValue slotBase, const Identifier&)
    499524{
    … …  
    504529    return result;
    505530}
     531
    506532
    507533JSValue jsTestObjStringAttrWithGetterException(ExecState* exec, JSValue slotBase, const Identifier&)
    … …  
    515541}
    516542
     543
    517544JSValue jsTestObjStringAttrWithSetterException(ExecState* exec, JSValue slotBase, const Identifier&)
    518545{
    … …  
    524551}
    525552
     553
    526554JSValue jsTestObjCustomAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    527555{
    … …  
    530558}
    531559
     560
    532561JSValue jsTestObjScriptStringAttr(ExecState* exec, JSValue slotBase, const Identifier&)
    533562{
    … …  
    538567    return result;
    539568}
     569
    540570
    541571#if ENABLE(Condition1)
    … …  
    548578    return result;
    549579}
     580
    550581#endif
    551582
    … …  
    559590    return result;
    560591}
     592
    561593#endif
    562594
    … …  
    570602    return result;
    571603}
     604
    572605#endif
    573606
    … …  
    581614}
    582615
     616
    583617JSValue jsTestObjId(ExecState* exec, JSValue slotBase, const Identifier&)
    584618{
    … …  
    590624}
    591625
     626
    592627JSValue jsTestObjHash(ExecState* exec, JSValue slotBase, const Identifier&)
    593628{
    … …  
    598633    return result;
    599634}
     635
    600636
    601637JSValue jsTestObjConstructor(ExecState* exec, JSValue slotBase, const Identifier&)
    … …  
    607643void JSTestObj::put(ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot)
    608644{
     645    ASSERT_GC_OBJECT_INHERITS(this, &s_info);
    609646    lookupPut<JSTestObj, Base>(exec, propertyName, value, &JSTestObjTable, this, slot);
    610647}
    … …  
    617654}
    618655
     656
    619657void setJSTestObjUnsignedShortAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    620658{
    … …  
    624662}
    625663
     664
    626665void setJSTestObjIntAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    627666{
    … …  
    631670}
    632671
     672
    633673void setJSTestObjLongLongAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    634674{
    … …  
    638678}
    639679
     680
    640681void setJSTestObjUnsignedLongLongAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    641682{
    … …  
    645686}
    646687
     688
    647689void setJSTestObjStringAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    648690{
    … …  
    652694}
    653695
     696
    654697void setJSTestObjTestObjAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    655698{
    … …  
    659702}
    660703
     704
    661705void setJSTestObjXMLObjAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    662706{
    … …  
    666710}
    667711
     712
    668713void setJSTestObjCreate(ExecState* exec, JSObject* thisObject, JSValue value)
    669714{
    … …  
    673718}
    674719
     720
    675721void setJSTestObjReflectedStringAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    676722{
    … …  
    680726}
    681727
     728
    682729void setJSTestObjReflectedIntegralAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    683730{
    … …  
    687734}
    688735
     736
    689737void setJSTestObjReflectedUnsignedIntegralAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    690738{
    … …  
    694742}
    695743
     744
    696745void setJSTestObjReflectedBooleanAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    697746{
    … …  
    701750}
    702751
     752
    703753void setJSTestObjReflectedURLAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    704754{
    … …  
    708758}
    709759
     760
    710761void setJSTestObjReflectedNonEmptyURLAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    711762{
    … …  
    715766}
    716767
     768
    717769void setJSTestObjReflectedStringAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    718770{
    … …  
    722774}
    723775
     776
    724777void setJSTestObjReflectedCustomIntegralAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    725778{
    … …  
    729782}
    730783
     784
    731785void setJSTestObjReflectedCustomBooleanAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    732786{
    … …  
    736790}
    737791
     792
    738793void setJSTestObjReflectedCustomURLAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    739794{
    … …  
    743798}
    744799
     800
    745801void setJSTestObjReflectedCustomNonEmptyURLAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    746802{
    … …  
    749805    imp->setAttribute(WebCore::HTMLNames::customContentNonEmptyURLAttrAttr, valueToStringWithNullCheck(exec, value));
    750806}
     807
    751808
    752809void setJSTestObjAttrWithGetterException(ExecState* exec, JSObject* thisObject, JSValue value)
    … …  
    759816}
    760817
     818
    761819void setJSTestObjAttrWithSetterException(ExecState* exec, JSObject* thisObject, JSValue value)
    762820{
    … …  
    768826}
    769827
     828
    770829void setJSTestObjStringAttrWithGetterException(ExecState* exec, JSObject* thisObject, JSValue value)
    771830{
    … …  
    777836}
    778837
     838
    779839void setJSTestObjStringAttrWithSetterException(ExecState* exec, JSObject* thisObject, JSValue value)
    780840{
    … …  
    786846}
    787847
     848
    788849void setJSTestObjCustomAttr(ExecState* exec, JSObject* thisObject, JSValue value)
    789850{
    790851    static_cast<JSTestObj*>(thisObject)->setCustomAttr(exec, value);
    791852}
     853
    792854
    793855#if ENABLE(Condition1)
    … …  
    798860    imp->setConditionalAttr1(value.toInt32(exec));
    799861}
     862
    800863#endif
    801864
    … …  
    807870    imp->setConditionalAttr2(value.toInt32(exec));
    808871}
     872
    809873#endif
    810874
    … …  
    816880    imp->setConditionalAttr3(value.toInt32(exec));
    817881}
     882
    818883#endif
    819884
    … …  
    825890}
    826891
     892
    827893JSValue JSTestObj::getConstructor(ExecState* exec, JSGlobalObject* globalObject)
    828894{
    … …  
    836902        return throwVMTypeError(exec);
    837903    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     904    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    838905    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    839906
    … …  
    848915        return throwVMTypeError(exec);
    849916    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     917    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    850918    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    851919    int intArg(exec->argument(0).toInt32(exec));
    … …  
    869937        return throwVMTypeError(exec);
    870938    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     939    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    871940    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    872941
    … …  
    882951        return throwVMTypeError(exec);
    883952    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     953    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    884954    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    885955    int intArg(exec->argument(0).toInt32(exec));
    … …  
    904974        return throwVMTypeError(exec);
    905975    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     976    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    906977    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    907978
    … …  
    917988        return throwVMTypeError(exec);
    918989    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     990    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    919991    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    920992    int intArg(exec->argument(0).toInt32(exec));
    … …  
    9391011        return throwVMTypeError(exec);
    9401012    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1013    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    9411014    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    9421015    if (exec->argumentCount() < 2)
    … …  
    9601033        return throwVMTypeError(exec);
    9611034    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1035    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    9621036    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    9631037    if (exec->argumentCount() < 2)
    … …  
    9831057        return throwVMTypeError(exec);
    9841058    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1059    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    9851060    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    9861061    RefPtr<SerializedScriptValue> serializedArg(SerializedScriptValue::create(exec, exec->argument(0)));
    … …  
    9981073        return throwVMTypeError(exec);
    9991074    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1075    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    10001076    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    10011077    RefPtr<IDBKey> key(createIDBKeyFromValue(exec, exec->argument(0)));
    … …  
    10131089        return throwVMTypeError(exec);
    10141090    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1091    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    10151092    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    10161093    OptionsObject* oo(toOptionsObject(exec->argument(0)));
    … …  
    10381115        return throwVMTypeError(exec);
    10391116    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1117    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    10401118    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    10411119    ExceptionCode ec = 0;
    … …  
    10521130        return throwVMTypeError(exec);
    10531131    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1132    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    10541133    return JSValue::encode(castedThis->customMethod(exec));
    10551134}
    … …  
    10611140        return throwVMTypeError(exec);
    10621141    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1142    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    10631143    return JSValue::encode(castedThis->customMethodWithArgs(exec));
    10641144}
    … …  
    10701150        return throwVMTypeError(exec);
    10711151    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1152    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    10721153    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    10731154    ExceptionCode ec = 0;
    … …  
    10901171        return throwVMTypeError(exec);
    10911172    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1173    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    10921174    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    10931175    JSValue listener = exec->argument(1);
    … …  
    11041186        return throwVMTypeError(exec);
    11051187    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1188    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    11061189    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    11071190    JSValue listener = exec->argument(1);
    … …  
    11181201        return throwVMTypeError(exec);
    11191202    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1203    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    11201204    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    11211205    Frame* dynamicFrame = toDynamicFrame(exec);
    … …  
    11331217        return throwVMTypeError(exec);
    11341218    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1219    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    11351220    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    11361221    Frame* dynamicFrame = toDynamicFrame(exec);
    … …  
    11511236        return throwVMTypeError(exec);
    11521237    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1238    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    11531239    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    11541240    Frame* dynamicFrame = toDynamicFrame(exec);
    … …  
    11791265        return throwVMTypeError(exec);
    11801266    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1267    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    11811268    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    11821269    Frame* dynamicFrame = toDynamicFrame(exec);
    … …  
    11971284        return throwVMTypeError(exec);
    11981285    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1286    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    11991287    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    12001288    Frame* dynamicFrame = toDynamicFrame(exec);
    … …  
    12251313        return throwVMTypeError(exec);
    12261314    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1315    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    12271316    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    12281317
    … …  
    12371326        return throwVMTypeError(exec);
    12381327    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1328    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    12391329    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    12401330
    … …  
    12521342        return throwVMTypeError(exec);
    12531343    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1344    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    12541345    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    12551346    ExceptionCode ec = 0;
    … …  
    12661357        return throwVMTypeError(exec);
    12671358    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1359    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    12681360    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    12691361    ExceptionCode ec = 0;
    … …  
    12831375        return throwVMTypeError(exec);
    12841376    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1377    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    12851378    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    12861379    ScriptExecutionContext* scriptContext = static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject())->scriptExecutionContext();
    … …  
    12981391        return throwVMTypeError(exec);
    12991392    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1393    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    13001394    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    13011395
    … …  
    13201414        return throwVMTypeError(exec);
    13211415    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1416    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    13221417    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    13231418    int nonOpt(exec->argument(0).toInt32(exec));
    … …  
    13451440        return throwVMTypeError(exec);
    13461441    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1442    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    13471443    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    13481444    int nonOpt(exec->argument(0).toInt32(exec));
    … …  
    13731469        return throwVMTypeError(exec);
    13741470    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1471    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    13751472    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    13761473    if (exec->argumentCount() <= 0 || !exec->argument(0).isObject()) {
    … …  
    13901487        return throwVMTypeError(exec);
    13911488    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1489    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    13921490    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    13931491    int nonCallback(exec->argument(0).toInt32(exec));
    … …  
    14101508        return throwVMTypeError(exec);
    14111509    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1510    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    14121511    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    14131512    RefPtr<TestCallback> callback;
    … …  
    14301529        return throwVMTypeError(exec);
    14311530    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1531    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    14321532    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    14331533    TestObj* objArg(toTestObj(exec->argument(0)));
    … …  
    14481548        return throwVMTypeError(exec);
    14491549    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1550    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    14501551    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    14511552    TestObj* objArg(toTestObj(exec->argument(0)));
    … …  
    14731574        return throwVMTypeError(exec);
    14741575    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1576    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    14751577    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    14761578    const String& strArg(ustringToString(exec->argument(0).toString(exec)));
    … …  
    14881590        return throwVMTypeError(exec);
    14891591    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1592    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    14901593    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    14911594    int intArg(exec->argument(0).toInt32(exec));
    … …  
    15031606        return throwVMTypeError(exec);
    15041607    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1608    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    15051609    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    15061610    if (exec->argumentCount() <= 0 || !exec->argument(0).isObject()) {
    … …  
    15351639        return throwVMTypeError(exec);
    15361640    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1641    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    15371642    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    15381643
    … …  
    15471652        return throwVMTypeError(exec);
    15481653    JSTestObj* castedThis = static_cast<JSTestObj*>(asObject(thisValue));
     1654    ASSERT_GC_OBJECT_INHERITS(castedThis, &JSTestObj::s_info);
    15491655    TestObj* imp = static_cast<TestObj*>(castedThis->impl());
    15501656
    … …  
    16321738}
    16331739
    1634 JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestObj* object)
    1635 {
    1636     return getDOMObjectWrapper<JSTestObj>(exec, globalObject, object);
    1637 }
     1740JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestObj* impl)
     1741{
     1742    return wrap<JSTestObj>(exec, globalObject, impl);
     1743}
     1744
    16381745TestObj* toTestObj(JSC::JSValue value)
    16391746{

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h

    r81789 r87360  
    3131class TestObj;
    3232
    33 class JSTestObj : public DOMObjectWithGlobalPointer {
    34     typedef DOMObjectWithGlobalPointer Base;
     33class JSTestObj : public JSDOMWrapper {
     34    typedef JSDOMWrapper Base;
    3535public:
    36     JSTestObj(NonNullPassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<TestObj>);
     36    JSTestObj(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<TestObj>);
    3737    static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*);
    3838    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&);
    … …  
    4141    static const JSC::ClassInfo s_info;
    4242
    43     static PassRefPtr<JSC::Structure> createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)
     43    static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)
    4444    {
    4545        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
    … …  
    7373    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);
    7474    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)
    7676    {
    7777        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
    7878    }
    79     JSTestObjPrototype(JSC::JSGlobalObject* 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) { }
    8080protected:
    8181    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp

    r81789 r87360  
    6767class JSTestSerializedScriptValueInterfaceConstructor : public DOMConstructorObject {
    6868public:
    69     JSTestSerializedScriptValueInterfaceConstructor(JSC::ExecState*, JSDOMGlobalObject*);
     69    JSTestSerializedScriptValueInterfaceConstructor(JSC::ExecState*, JSC::Structure*, JSDOMGlobalObject*);
    7070
    7171    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);
    7272    virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);
    7373    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)
    7575    {
    7676        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
    … …  
    8282const ClassInfo JSTestSerializedScriptValueInterfaceConstructor::s_info = { "TestSerializedScriptValueInterfaceConstructor", &DOMConstructorObject::s_info, &JSTestSerializedScriptValueInterfaceConstructorTable, 0 };
    8383
    84 JSTestSerializedScriptValueInterfaceConstructor::JSTestSerializedScriptValueInterfaceConstructor(ExecState* exec, JSDOMGlobalObject* globalObject)
    85     : DOMConstructorObject(JSTestSerializedScriptValueInterfaceConstructor::createStructure(globalObject->globalData(), globalObject->objectPrototype()), globalObject)
     84JSTestSerializedScriptValueInterfaceConstructor::JSTestSerializedScriptValueInterfaceConstructor(ExecState* exec, Structure* structure, JSDOMGlobalObject* globalObject)
     85    : DOMConstructorObject(structure, globalObject)
    8686{
    8787    ASSERT(inherits(&s_info));
    … …  
    9191bool JSTestSerializedScriptValueInterfaceConstructor::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
    9292{
    93     return getStaticValueSlot<JSTestSerializedScriptValueInterfaceConstructor, DOMObject>(exec, &JSTestSerializedScriptValueInterfaceConstructorTable, this, propertyName, slot);
     93    return getStaticValueSlot<JSTestSerializedScriptValueInterfaceConstructor, JSDOMWrapper>(exec, &JSTestSerializedScriptValueInterfaceConstructorTable, this, propertyName, slot);
    9494}
    9595
    9696bool JSTestSerializedScriptValueInterfaceConstructor::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
    9797{
    98     return getStaticValueDescriptor<JSTestSerializedScriptValueInterfaceConstructor, DOMObject>(exec, &JSTestSerializedScriptValueInterfaceConstructorTable, this, propertyName, descriptor);
     98    return getStaticValueDescriptor<JSTestSerializedScriptValueInterfaceConstructor, JSDOMWrapper>(exec, &JSTestSerializedScriptValueInterfaceConstructorTable, this, propertyName, descriptor);
    9999}
    100100
    … …  
    120120}
    121121
    122 const ClassInfo JSTestSerializedScriptValueInterface::s_info = { "TestSerializedScriptValueInterface", &DOMObjectWithGlobalPointer::s_info, &JSTestSerializedScriptValueInterfaceTable, 0 };
     122const ClassInfo JSTestSerializedScriptValueInterface::s_info = { "TestSerializedScriptValueInterface", &JSDOMWrapper::s_info, &JSTestSerializedScriptValueInterfaceTable, 0 };
    123123
    124 JSTestSerializedScriptValueInterface::JSTestSerializedScriptValueInterface(NonNullPassRefPtr<Structure> structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestSerializedScriptValueInterface> impl)
    125     : DOMObjectWithGlobalPointer(structure, globalObject)
     124JSTestSerializedScriptValueInterface::JSTestSerializedScriptValueInterface(Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<TestSerializedScriptValueInterface> impl)
     125    : JSDOMWrapper(structure, globalObject)
    126126    , m_impl(impl)
    127127{
    … …  
    131131JSObject* JSTestSerializedScriptValueInterface::createPrototype(ExecState* exec, JSGlobalObject* globalObject)
    132132{
    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()));
    134134}
    135135
    136136bool JSTestSerializedScriptValueInterface::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
    137137{
     138    ASSERT_GC_OBJECT_INHERITS(this, &s_info);
    138139    return getStaticValueSlot<JSTestSerializedScriptValueInterface, Base>(exec, &JSTestSerializedScriptValueInterfaceTable, this, propertyName, slot);
    139140}
    … …  
    141142bool JSTestSerializedScriptValueInterface::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
    142143{
     144    ASSERT_GC_OBJECT_INHERITS(this, &s_info);
    143145    return getStaticValueDescriptor<JSTestSerializedScriptValueInterface, Base>(exec, &JSTestSerializedScriptValueInterfaceTable, this, propertyName, descriptor);
    144146}
    … …  
    153155}
    154156
     157
    155158JSValue jsTestSerializedScriptValueInterfaceConstructor(ExecState* exec, JSValue slotBase, const Identifier&)
    156159{
    … …  
    164167}
    165168
    166 JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestSerializedScriptValueInterface* object)
     169JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestSerializedScriptValueInterface* impl)
    167170{
    168     return getDOMObjectWrapper<JSTestSerializedScriptValueInterface>(exec, globalObject, object);
     171    return wrap<JSTestSerializedScriptValueInterface>(exec, globalObject, impl);
    169172}
     173
    170174TestSerializedScriptValueInterface* toTestSerializedScriptValueInterface(JSC::JSValue value)
    171175{

  • trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h

    r81789 r87360  
    3333class TestSerializedScriptValueInterface;
    3434
    35 class JSTestSerializedScriptValueInterface : public DOMObjectWithGlobalPointer {
    36     typedef DOMObjectWithGlobalPointer Base;
     35class JSTestSerializedScriptValueInterface : public JSDOMWrapper {
     36    typedef JSDOMWrapper Base;
    3737public:
    38     JSTestSerializedScriptValueInterface(NonNullPassRefPtr<JSC::Structure>, JSDOMGlobalObject*, PassRefPtr<TestSerializedScriptValueInterface>);
     38    JSTestSerializedScriptValueInterface(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<TestSerializedScriptValueInterface>);
    3939    static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*);
    4040    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier& propertyName, JSC::PropertySlot&);
    … …  
    4242    static const JSC::ClassInfo s_info;
    4343
    44     static PassRefPtr<JSC::Structure> createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)
     44    static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)
    4545    {
    4646        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
    … …  
    6464    static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*);
    6565    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)
    6767    {
    6868        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
    6969    }
    70     JSTestSerializedScriptValueInterfacePrototype(JSC::JSGlobalObject* 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) { }
    7171protected:
    7272    static const unsigned StructureFlags = Base::StructureFlags;

  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestInterface.cpp

    r87063 r87360  
    8989    impl->ref();
    9090    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
    9195    if (!hasDependentLifetime)
    9296        wrapperHandle.MarkIndependent();
     97#endif
    9398    getDOMObjectMap().set(impl, wrapperHandle);
    9499    return wrapper;

  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestMediaQueryListListener.cpp

    r87063 r87360  
    9696    impl->ref();
    9797    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
    98102    if (!hasDependentLifetime)
    99103        wrapperHandle.MarkIndependent();
     104#endif
    100105    getDOMObjectMap().set(impl, wrapperHandle);
    101106    return wrapper;

  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp

    r87063 r87360  
    13821382    impl->ref();
    13831383    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
    13841388    if (!hasDependentLifetime)
    13851389        wrapperHandle.MarkIndependent();
     1390#endif
    13861391    getDOMObjectMap().set(impl, wrapperHandle);
    13871392    return wrapper;

  • trunk/Source/WebCore/bindings/scripts/test/V8/V8TestSerializedScriptValueInterface.cpp

    r87063 r87360  
    8585    SerializedScriptValue::deserializeAndSetProperty(wrapper, "value", static_cast<v8::PropertyAttribute>(v8::DontDelete | v8::ReadOnly), impl->value());
    8686    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
    8791    if (!hasDependentLifetime)
    8892        wrapperHandle.MarkIndependent();
     93#endif
    8994    getDOMObjectMap().set(impl, wrapperHandle);
    9095    return wrapper;
Note: See TracChangeset for help on using the changeset viewer.