Diff
Modified: trunk/Source/WebCore/ChangeLog (100399 => 100400)
--- trunk/Source/WebCore/ChangeLog 2011-11-16 04:47:12 UTC (rev 100399)
+++ trunk/Source/WebCore/ChangeLog 2011-11-16 05:10:42 UTC (rev 100400)
@@ -1,3 +1,52 @@
+2011-11-15 Mark Hahnenberg <mhahnenb...@apple.com>
+
+ 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):
+
2011-11-15 Jeff Timanus <t...@chromium.org>
Patch removing duplicated code in the setup of the DrawingBuffer used
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp (100399 => 100400)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2011-11-16 04:47:12 UTC (rev 100399)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2011-11-16 05:10:42 UTC (rev 100400)
@@ -193,6 +193,30 @@
return getDOMConstructor<JSTestEventConstructorConstructor>(exec, static_cast<JSDOMGlobalObject*>(globalObject));
}
+static inline bool isObservable(JSTestEventConstructor* jsTestEventConstructor)
+{
+ if (jsTestEventConstructor->hasCustomProperties())
+ return true;
+ return false;
+}
+
+bool JSTestEventConstructorOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
+{
+ JSTestEventConstructor* jsTestEventConstructor = static_cast<JSTestEventConstructor*>(handle.get().asCell());
+ if (!isObservable(jsTestEventConstructor))
+ return false;
+ UNUSED_PARAM(visitor);
+ return false;
+}
+
+void JSTestEventConstructorOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
+{
+ JSTestEventConstructor* jsTestEventConstructor = static_cast<JSTestEventConstructor*>(handle.get().asCell());
+ DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
+ uncacheWrapper(world, jsTestEventConstructor->impl(), jsTestEventConstructor);
+ jsTestEventConstructor->clearImpl();
+}
+
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestEventConstructor* impl)
{
return wrap<JSTestEventConstructor>(exec, globalObject, impl);
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h (100399 => 100400)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h 2011-11-16 04:47:12 UTC (rev 100399)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h 2011-11-16 05:10:42 UTC (rev 100400)
@@ -51,6 +51,7 @@
static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
TestEventConstructor* impl() const { return m_impl.get(); }
+ void clearImpl() { m_impl.clear(); }
private:
RefPtr<TestEventConstructor> m_impl;
@@ -60,6 +61,22 @@
static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
};
+class JSTestEventConstructorOwner : public JSC::WeakHandleOwner {
+ virtual bool isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown>, void* context, JSC::SlotVisitor&);
+ virtual void finalize(JSC::Handle<JSC::Unknown>, void* context);
+};
+
+inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, TestEventConstructor*)
+{
+ DEFINE_STATIC_LOCAL(JSTestEventConstructorOwner, jsTestEventConstructorOwner, ());
+ return &jsTestEventConstructorOwner;
+}
+
+inline void* wrapperContext(DOMWrapperWorld* world, TestEventConstructor*)
+{
+ return world;
+}
+
JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestEventConstructor*);
TestEventConstructor* toTestEventConstructor(JSC::JSValue);
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (100399 => 100400)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2011-11-16 04:47:12 UTC (rev 100399)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2011-11-16 05:10:42 UTC (rev 100400)
@@ -221,6 +221,7 @@
JSTestInterface* jsTestInterface = static_cast<JSTestInterface*>(handle.get().asCell());
DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
uncacheWrapper(world, jsTestInterface->impl(), jsTestInterface);
+ jsTestInterface->clearImpl();
}
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestInterface* impl)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h (100399 => 100400)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h 2011-11-16 04:47:12 UTC (rev 100399)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h 2011-11-16 05:10:42 UTC (rev 100400)
@@ -53,6 +53,7 @@
static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
TestInterface* impl() const { return m_impl.get(); }
+ void clearImpl() { m_impl.clear(); }
private:
RefPtr<TestInterface> m_impl;
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp (100399 => 100400)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp 2011-11-16 04:47:12 UTC (rev 100399)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp 2011-11-16 05:10:42 UTC (rev 100400)
@@ -197,6 +197,30 @@
return JSValue::encode(jsUndefined());
}
+static inline bool isObservable(JSTestMediaQueryListListener* jsTestMediaQueryListListener)
+{
+ if (jsTestMediaQueryListListener->hasCustomProperties())
+ return true;
+ return false;
+}
+
+bool JSTestMediaQueryListListenerOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
+{
+ JSTestMediaQueryListListener* jsTestMediaQueryListListener = static_cast<JSTestMediaQueryListListener*>(handle.get().asCell());
+ if (!isObservable(jsTestMediaQueryListListener))
+ return false;
+ UNUSED_PARAM(visitor);
+ return false;
+}
+
+void JSTestMediaQueryListListenerOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
+{
+ JSTestMediaQueryListListener* jsTestMediaQueryListListener = static_cast<JSTestMediaQueryListListener*>(handle.get().asCell());
+ DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
+ uncacheWrapper(world, jsTestMediaQueryListListener->impl(), jsTestMediaQueryListListener);
+ jsTestMediaQueryListListener->clearImpl();
+}
+
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestMediaQueryListListener* impl)
{
return wrap<JSTestMediaQueryListListener>(exec, globalObject, impl);
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h (100399 => 100400)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h 2011-11-16 04:47:12 UTC (rev 100399)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h 2011-11-16 05:10:42 UTC (rev 100400)
@@ -51,6 +51,7 @@
static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
TestMediaQueryListListener* impl() const { return m_impl.get(); }
+ void clearImpl() { m_impl.clear(); }
private:
RefPtr<TestMediaQueryListListener> m_impl;
@@ -60,6 +61,22 @@
static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
};
+class JSTestMediaQueryListListenerOwner : public JSC::WeakHandleOwner {
+ virtual bool isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown>, void* context, JSC::SlotVisitor&);
+ virtual void finalize(JSC::Handle<JSC::Unknown>, void* context);
+};
+
+inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, TestMediaQueryListListener*)
+{
+ DEFINE_STATIC_LOCAL(JSTestMediaQueryListListenerOwner, jsTestMediaQueryListListenerOwner, ());
+ return &jsTestMediaQueryListListenerOwner;
+}
+
+inline void* wrapperContext(DOMWrapperWorld* world, TestMediaQueryListListener*)
+{
+ return world;
+}
+
JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestMediaQueryListListener*);
TestMediaQueryListListener* toTestMediaQueryListListener(JSC::JSValue);
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp (100399 => 100400)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2011-11-16 04:47:12 UTC (rev 100399)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2011-11-16 05:10:42 UTC (rev 100400)
@@ -186,6 +186,7 @@
JSTestNamedConstructor* jsTestNamedConstructor = static_cast<JSTestNamedConstructor*>(handle.get().asCell());
DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
uncacheWrapper(world, jsTestNamedConstructor->impl(), jsTestNamedConstructor);
+ jsTestNamedConstructor->clearImpl();
}
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestNamedConstructor* impl)
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h (100399 => 100400)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h 2011-11-16 04:47:12 UTC (rev 100399)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h 2011-11-16 05:10:42 UTC (rev 100400)
@@ -51,6 +51,7 @@
static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
TestNamedConstructor* impl() const { return m_impl.get(); }
+ void clearImpl() { m_impl.clear(); }
private:
RefPtr<TestNamedConstructor> m_impl;
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (100399 => 100400)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2011-11-16 04:47:12 UTC (rev 100399)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2011-11-16 05:10:42 UTC (rev 100400)
@@ -1979,6 +1979,30 @@
return jsNumber(static_cast<int>(15));
}
+static inline bool isObservable(JSTestObj* jsTestObj)
+{
+ if (jsTestObj->hasCustomProperties())
+ return true;
+ return false;
+}
+
+bool JSTestObjOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
+{
+ JSTestObj* jsTestObj = static_cast<JSTestObj*>(handle.get().asCell());
+ if (!isObservable(jsTestObj))
+ return false;
+ UNUSED_PARAM(visitor);
+ return false;
+}
+
+void JSTestObjOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
+{
+ JSTestObj* jsTestObj = static_cast<JSTestObj*>(handle.get().asCell());
+ DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
+ uncacheWrapper(world, jsTestObj->impl(), jsTestObj);
+ jsTestObj->clearImpl();
+}
+
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestObj* impl)
{
return wrap<JSTestObj>(exec, globalObject, impl);
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h (100399 => 100400)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2011-11-16 04:47:12 UTC (rev 100399)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h 2011-11-16 05:10:42 UTC (rev 100400)
@@ -64,6 +64,7 @@
JSC::JSValue customMethod(JSC::ExecState*);
JSC::JSValue customMethodWithArgs(JSC::ExecState*);
TestObj* impl() const { return m_impl.get(); }
+ void clearImpl() { m_impl.clear(); }
private:
RefPtr<TestObj> m_impl;
@@ -73,6 +74,22 @@
static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | JSC::OverridesVisitChildren | Base::StructureFlags;
};
+class JSTestObjOwner : public JSC::WeakHandleOwner {
+ virtual bool isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown>, void* context, JSC::SlotVisitor&);
+ virtual void finalize(JSC::Handle<JSC::Unknown>, void* context);
+};
+
+inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, TestObj*)
+{
+ DEFINE_STATIC_LOCAL(JSTestObjOwner, jsTestObjOwner, ());
+ return &jsTestObjOwner;
+}
+
+inline void* wrapperContext(DOMWrapperWorld* world, TestObj*)
+{
+ return world;
+}
+
JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestObj*);
TestObj* toTestObj(JSC::JSValue);
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp (100399 => 100400)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2011-11-16 04:47:12 UTC (rev 100399)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2011-11-16 05:10:42 UTC (rev 100400)
@@ -178,6 +178,30 @@
return getDOMConstructor<JSTestSerializedScriptValueInterfaceConstructor>(exec, static_cast<JSDOMGlobalObject*>(globalObject));
}
+static inline bool isObservable(JSTestSerializedScriptValueInterface* jsTestSerializedScriptValueInterface)
+{
+ if (jsTestSerializedScriptValueInterface->hasCustomProperties())
+ return true;
+ return false;
+}
+
+bool JSTestSerializedScriptValueInterfaceOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
+{
+ JSTestSerializedScriptValueInterface* jsTestSerializedScriptValueInterface = static_cast<JSTestSerializedScriptValueInterface*>(handle.get().asCell());
+ if (!isObservable(jsTestSerializedScriptValueInterface))
+ return false;
+ UNUSED_PARAM(visitor);
+ return false;
+}
+
+void JSTestSerializedScriptValueInterfaceOwner::finalize(JSC::Handle<JSC::Unknown> handle, void* context)
+{
+ JSTestSerializedScriptValueInterface* jsTestSerializedScriptValueInterface = static_cast<JSTestSerializedScriptValueInterface*>(handle.get().asCell());
+ DOMWrapperWorld* world = static_cast<DOMWrapperWorld*>(context);
+ uncacheWrapper(world, jsTestSerializedScriptValueInterface->impl(), jsTestSerializedScriptValueInterface);
+ jsTestSerializedScriptValueInterface->clearImpl();
+}
+
JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, TestSerializedScriptValueInterface* impl)
{
return wrap<JSTestSerializedScriptValueInterface>(exec, globalObject, impl);
Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h (100399 => 100400)
--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h 2011-11-16 04:47:12 UTC (rev 100399)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h 2011-11-16 05:10:42 UTC (rev 100400)
@@ -53,6 +53,7 @@
static JSC::JSValue getConstructor(JSC::ExecState*, JSC::JSGlobalObject*);
TestSerializedScriptValueInterface* impl() const { return m_impl.get(); }
+ void clearImpl() { m_impl.clear(); }
private:
RefPtr<TestSerializedScriptValueInterface> m_impl;
@@ -62,6 +63,22 @@
static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
};
+class JSTestSerializedScriptValueInterfaceOwner : public JSC::WeakHandleOwner {
+ virtual bool isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown>, void* context, JSC::SlotVisitor&);
+ virtual void finalize(JSC::Handle<JSC::Unknown>, void* context);
+};
+
+inline JSC::WeakHandleOwner* wrapperOwner(DOMWrapperWorld*, TestSerializedScriptValueInterface*)
+{
+ DEFINE_STATIC_LOCAL(JSTestSerializedScriptValueInterfaceOwner, jsTestSerializedScriptValueInterfaceOwner, ());
+ return &jsTestSerializedScriptValueInterfaceOwner;
+}
+
+inline void* wrapperContext(DOMWrapperWorld* world, TestSerializedScriptValueInterface*)
+{
+ return world;
+}
+
JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, TestSerializedScriptValueInterface*);
TestSerializedScriptValueInterface* toTestSerializedScriptValueInterface(JSC::JSValue);
