Changeset 100400 in webkit


Ignore:
Timestamp:
Nov 15, 2011, 9:10:42 PM (14 years ago)
Author:
mhahnenberg@apple.com
Message:

Rebaseline generated WebCore bindings

Unreviewed build fix

No new tests.

  • bindings/scripts/test/JS/JSTestEventConstructor.cpp:

(WebCore::isObservable):
(WebCore::JSTestEventConstructorOwner::isReachableFromOpaqueRoots):
(WebCore::JSTestEventConstructorOwner::finalize):

  • bindings/scripts/test/JS/JSTestEventConstructor.h:

(WebCore::JSTestEventConstructor::clearImpl):
(WebCore::wrapperOwner):
(WebCore::wrapperContext):

  • bindings/scripts/test/JS/JSTestInterface.cpp:

(WebCore::JSTestInterfaceOwner::finalize):

  • bindings/scripts/test/JS/JSTestInterface.h:

(WebCore::JSTestInterface::clearImpl):

  • bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:

(WebCore::isObservable):
(WebCore::JSTestMediaQueryListListenerOwner::isReachableFromOpaqueRoots):
(WebCore::JSTestMediaQueryListListenerOwner::finalize):

  • bindings/scripts/test/JS/JSTestMediaQueryListListener.h:

(WebCore::JSTestMediaQueryListListener::clearImpl):
(WebCore::wrapperOwner):
(WebCore::wrapperContext):

  • bindings/scripts/test/JS/JSTestNamedConstructor.cpp:

(WebCore::JSTestNamedConstructorOwner::finalize):

  • bindings/scripts/test/JS/JSTestNamedConstructor.h:

(WebCore::JSTestNamedConstructor::clearImpl):

  • bindings/scripts/test/JS/JSTestObj.cpp:

(WebCore::isObservable):
(WebCore::JSTestObjOwner::isReachableFromOpaqueRoots):
(WebCore::JSTestObjOwner::finalize):

  • bindings/scripts/test/JS/JSTestObj.h:

(WebCore::JSTestObj::clearImpl):
(WebCore::wrapperOwner):
(WebCore::wrapperContext):

  • bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:

(WebCore::isObservable):
(WebCore::JSTestSerializedScriptValueInterfaceOwner::isReachableFromOpaqueRoots):
(WebCore::JSTestSerializedScriptValueInterfaceOwner::finalize):

  • bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h:

(WebCore::JSTestSerializedScriptValueInterface::clearImpl):
(WebCore::wrapperOwner):
(WebCore::wrapperContext):

Location:
trunk/Source/WebCore
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r100399 r100400  
     12011-11-15  Mark Hahnenberg  <mhahnenberg@apple.com>
     2
     3        Rebaseline generated WebCore bindings
     4
     5        Unreviewed build fix
     6
     7        No new tests.
     8
     9        * bindings/scripts/test/JS/JSTestEventConstructor.cpp:
     10        (WebCore::isObservable):
     11        (WebCore::JSTestEventConstructorOwner::isReachableFromOpaqueRoots):
     12        (WebCore::JSTestEventConstructorOwner::finalize):
     13        * bindings/scripts/test/JS/JSTestEventConstructor.h:
     14        (WebCore::JSTestEventConstructor::clearImpl):
     15        (WebCore::wrapperOwner):
     16        (WebCore::wrapperContext):
     17        * bindings/scripts/test/JS/JSTestInterface.cpp:
     18        (WebCore::JSTestInterfaceOwner::finalize):
     19        * bindings/scripts/test/JS/JSTestInterface.h:
     20        (WebCore::JSTestInterface::clearImpl):
     21        * bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
     22        (WebCore::isObservable):
     23        (WebCore::JSTestMediaQueryListListenerOwner::isReachableFromOpaqueRoots):
     24        (WebCore::JSTestMediaQueryListListenerOwner::finalize):
     25        * bindings/scripts/test/JS/JSTestMediaQueryListListener.h:
     26        (WebCore::JSTestMediaQueryListListener::clearImpl):
     27        (WebCore::wrapperOwner):
     28        (WebCore::wrapperContext):
     29        * bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
     30        (WebCore::JSTestNamedConstructorOwner::finalize):
     31        * bindings/scripts/test/JS/JSTestNamedConstructor.h:
     32        (WebCore::JSTestNamedConstructor::clearImpl):
     33        * bindings/scripts/test/JS/JSTestObj.cpp:
     34        (WebCore::isObservable):
     35        (WebCore::JSTestObjOwner::isReachableFromOpaqueRoots):
     36        (WebCore::JSTestObjOwner::finalize):
     37        * bindings/scripts/test/JS/JSTestObj.h:
     38        (WebCore::JSTestObj::clearImpl):
     39        (WebCore::wrapperOwner):
     40        (WebCore::wrapperContext):
     41        * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
     42        (WebCore::isObservable):
     43        (WebCore::JSTestSerializedScriptValueInterfaceOwner::isReachableFromOpaqueRoots):
     44        (WebCore::JSTestSerializedScriptValueInterfaceOwner::finalize):
     45        * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h:
     46        (WebCore::JSTestSerializedScriptValueInterface::clearImpl):
     47        (WebCore::wrapperOwner):
     48        (WebCore::wrapperContext):
     49
    1502011-11-15  Jeff Timanus  <twiz@chromium.org>
    251

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

    r100088 r100400  
    194194}
    195195
     196static inline bool isObservable(JSTestEventConstructor* jsTestEventConstructor)
     197{
     198    if (jsTestEventConstructor->hasCustomProperties())
     199        return true;
     200    return false;
     201}
     202
     203bool JSTestEventConstructorOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
     204{
     205    JSTestEventConstructor* jsTestEventConstructor = static_cast<JSTestEventConstructor*>(handle.get().asCell());
     206    if (!isObservable(jsTestEventConstructor))
     207        return false;
     208    UNUSED_PARAM(visitor);
     209    return false;
     210}
     211
     212void JSTestEventConstructorOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
     213{
     214    JSTestEventConstructor* jsTestEventConstructor = static_cast<JSTestEventConstructor*>(handle.get().asCell());
     215    DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
     216    uncacheWrapper(world, jsTestEventConstructor->impl(), jsTestEventConstructor);
     217    jsTestEventConstructor->clearImpl();
     218}
     219
    196220JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestEventConstructor* impl)
    197221{

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

    r99900 r100400  
    5252    static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
    5353    TestEventConstructor* impl() const { return m_impl.get(); }
     54    void clearImpl() { m_impl.clear(); }
    5455
    5556private:
    … …  
    6061    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
    6162};
     63
     64class JSTestEventConstructorOwner : public JSC::WeakHandleOwner {
     65    virtual bool isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown>, void* context, JSC::SlotVisitor&);
     66    virtual void finalize(JSC::Handle<JSC::Unknown>, void* context);
     67};
     68
     69inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, TestEventConstructor*)
     70{
     71    DEFINE_STATIC_LOCAL(JSTestEventConstructorOwner, jsTestEventConstructorOwner, ());
     72    return &jsTestEventConstructorOwner;
     73}
     74
     75inline void* wrapperContext(DOMWrapperWorld* world, TestEventConstructor*)
     76{
     77    return world;
     78}
    6279
    6380JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestEventConstructor*);

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

    r100086 r100400  
    222222    DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
    223223    uncacheWrapper(world, jsTestInterface->impl(), jsTestInterface);
     224    jsTestInterface->clearImpl();
    224225}
    225226

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

    r99754 r100400  
    5454    static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
    5555    TestInterface* impl() const { return m_impl.get(); }
     56    void clearImpl() { m_impl.clear(); }
    5657
    5758private:

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

    r100086 r100400  
    198198}
    199199
     200static inline bool isObservable(JSTestMediaQueryListListener* jsTestMediaQueryListListener)
     201{
     202    if (jsTestMediaQueryListListener->hasCustomProperties())
     203        return true;
     204    return false;
     205}
     206
     207bool JSTestMediaQueryListListenerOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
     208{
     209    JSTestMediaQueryListListener* jsTestMediaQueryListListener = static_cast<JSTestMediaQueryListListener*>(handle.get().asCell());
     210    if (!isObservable(jsTestMediaQueryListListener))
     211        return false;
     212    UNUSED_PARAM(visitor);
     213    return false;
     214}
     215
     216void JSTestMediaQueryListListenerOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
     217{
     218    JSTestMediaQueryListListener* jsTestMediaQueryListListener = static_cast<JSTestMediaQueryListListener*>(handle.get().asCell());
     219    DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
     220    uncacheWrapper(world, jsTestMediaQueryListListener->impl(), jsTestMediaQueryListListener);
     221    jsTestMediaQueryListListener->clearImpl();
     222}
     223
    200224JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestMediaQueryListListener* impl)
    201225{

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

    r99754 r100400  
    5252    static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
    5353    TestMediaQueryListListener* impl() const { return m_impl.get(); }
     54    void clearImpl() { m_impl.clear(); }
    5455
    5556private:
    … …  
    6061    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
    6162};
     63
     64class JSTestMediaQueryListListenerOwner : public JSC::WeakHandleOwner {
     65    virtual bool isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown>, void* context, JSC::SlotVisitor&);
     66    virtual void finalize(JSC::Handle<JSC::Unknown>, void* context);
     67};
     68
     69inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, TestMediaQueryListListener*)
     70{
     71    DEFINE_STATIC_LOCAL(JSTestMediaQueryListListenerOwner, jsTestMediaQueryListListenerOwner, ());
     72    return &jsTestMediaQueryListListenerOwner;
     73}
     74
     75inline void* wrapperContext(DOMWrapperWorld* world, TestMediaQueryListListener*)
     76{
     77    return world;
     78}
    6279
    6380JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestMediaQueryListListener*);

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

    r100086 r100400  
    187187    DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
    188188    uncacheWrapper(world, jsTestNamedConstructor->impl(), jsTestNamedConstructor);
     189    jsTestNamedConstructor->clearImpl();
    189190}
    190191

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

    r99776 r100400  
    5252    static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
    5353    TestNamedConstructor* impl() const { return m_impl.get(); }
     54    void clearImpl() { m_impl.clear(); }
    5455
    5556private:

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

    r100163 r100400  
    19801980}
    19811981
     1982static inline bool isObservable(JSTestObj* jsTestObj)
     1983{
     1984    if (jsTestObj->hasCustomProperties())
     1985        return true;
     1986    return false;
     1987}
     1988
     1989bool JSTestObjOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
     1990{
     1991    JSTestObj* jsTestObj = static_cast<JSTestObj*>(handle.get().asCell());
     1992    if (!isObservable(jsTestObj))
     1993        return false;
     1994    UNUSED_PARAM(visitor);
     1995    return false;
     1996}
     1997
     1998void JSTestObjOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
     1999{
     2000    JSTestObj* jsTestObj = static_cast<JSTestObj*>(handle.get().asCell());
     2001    DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
     2002    uncacheWrapper(world, jsTestObj->impl(), jsTestObj);
     2003    jsTestObj->clearImpl();
     2004}
     2005
    19822006JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestObj* impl)
    19832007{

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

    r100163 r100400  
    6565    JSC::JSValue customMethodWithArgs(JSC::ExecState*);
    6666    TestObj* impl() const { return m_impl.get(); }
     67    void clearImpl() { m_impl.clear(); }
    6768
    6869private:
    … …  
    7374    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | JSC::OverridesVisitChildren | Base::StructureFlags;
    7475};
     76
     77class JSTestObjOwner : public JSC::WeakHandleOwner {
     78    virtual bool isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown>, void* context, JSC::SlotVisitor&);
     79    virtual void finalize(JSC::Handle<JSC::Unknown>, void* context);
     80};
     81
     82inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, TestObj*)
     83{
     84    DEFINE_STATIC_LOCAL(JSTestObjOwner, jsTestObjOwner, ());
     85    return &jsTestObjOwner;
     86}
     87
     88inline void* wrapperContext(DOMWrapperWorld* world, TestObj*)
     89{
     90    return world;
     91}
    7592
    7693JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestObj*);

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

    r100086 r100400  
    179179}
    180180
     181static inline bool isObservable(JSTestSerializedScriptValueInterface* jsTestSerializedScriptValueInterface)
     182{
     183    if (jsTestSerializedScriptValueInterface->hasCustomProperties())
     184        return true;
     185    return false;
     186}
     187
     188bool JSTestSerializedScriptValueInterfaceOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
     189{
     190    JSTestSerializedScriptValueInterface* jsTestSerializedScriptValueInterface = static_cast<JSTestSerializedScriptValueInterface*>(handle.get().asCell());
     191    if (!isObservable(jsTestSerializedScriptValueInterface))
     192        return false;
     193    UNUSED_PARAM(visitor);
     194    return false;
     195}
     196
     197void JSTestSerializedScriptValueInterfaceOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
     198{
     199    JSTestSerializedScriptValueInterface* jsTestSerializedScriptValueInterface = static_cast<JSTestSerializedScriptValueInterface*>(handle.get().asCell());
     200    DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
     201    uncacheWrapper(world, jsTestSerializedScriptValueInterface->impl(), jsTestSerializedScriptValueInterface);
     202    jsTestSerializedScriptValueInterface->clearImpl();
     203}
     204
    181205JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestSerializedScriptValueInterface* impl)
    182206{

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

    r99754 r100400  
    5454    static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
    5555    TestSerializedScriptValueInterface* impl() const { return m_impl.get(); }
     56    void clearImpl() { m_impl.clear(); }
    5657
    5758private:
    … …  
    6263    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
    6364};
     65
     66class JSTestSerializedScriptValueInterfaceOwner : public JSC::WeakHandleOwner {
     67    virtual bool isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown>, void* context, JSC::SlotVisitor&);
     68    virtual void finalize(JSC::Handle<JSC::Unknown>, void* context);
     69};
     70
     71inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, TestSerializedScriptValueInterface*)
     72{
     73    DEFINE_STATIC_LOCAL(JSTestSerializedScriptValueInterfaceOwner, jsTestSerializedScriptValueInterfaceOwner, ());
     74    return &jsTestSerializedScriptValueInterfaceOwner;
     75}
     76
     77inline void* wrapperContext(DOMWrapperWorld* world, TestSerializedScriptValueInterface*)
     78{
     79    return world;
     80}
    6481
    6582JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestSerializedScriptValueInterface*);
Note: See TracChangeset for help on using the changeset viewer.