Rename JSDOMWrapper to JSDOMObject and JSDOMWrapperWithImplementation to JSDOMWrapper
https://bugs.webkit.org/show_bug.cgi?id=150120
Reviewed by Sam Weinig.
No change in behavior.
* bindings/js/DOMWrapperWorld.h:
* bindings/js/JSDOMBinding.h:
(WebCore::DOMConstructorObject::DOMConstructorObject):
(WebCore::getInlineCachedWrapper):
(WebCore::setInlineCachedWrapper):
(WebCore::clearInlineCachedWrapper):
(WebCore::createWrapper):
(WebCore::getStaticValueSlotEntryWithoutCaching<JSDOMObject>):
* bindings/js/JSDOMWrapper.cpp:
* bindings/js/JSDOMWrapper.h:
(WebCore::JSDOMObject::JSDOMObject):
(WebCore::JSDOMWrapper::~JSDOMWrapper):
(WebCore::JSDOMWrapper::JSDOMWrapper):
* bindings/js/JSElementCustom.cpp:
(WebCore::toJSNewlyCreated):
* bindings/js/JSNodeCustom.cpp:
(WebCore::createWrapperInline):
* bindings/js/ScriptWrappable.h:
* bindings/js/ScriptWrappableInlines.h:
(WebCore::ScriptWrappable::wrapper):
(WebCore::ScriptWrappable::setWrapper):
(WebCore::ScriptWrappable::clearWrapper):
* bindings/scripts/CodeGeneratorJS.pm:
(GetParentClassName):
* bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
(WebCore::JSTestActiveDOMObject::JSTestActiveDOMObject):
* bindings/scripts/test/JS/JSTestActiveDOMObject.h:
* bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp:
(WebCore::JSTestCustomConstructorWithNoInterfaceObject::JSTestCustomConstructorWithNoInterfaceObject):
* bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.h:
* bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
(WebCore::JSTestCustomNamedGetter::JSTestCustomNamedGetter):
* bindings/scripts/test/JS/JSTestCustomNamedGetter.h:
* bindings/scripts/test/JS/JSTestEventConstructor.cpp:
(WebCore::JSTestEventConstructor::JSTestEventConstructor):
* bindings/scripts/test/JS/JSTestEventConstructor.h:
* bindings/scripts/test/JS/JSTestEventTarget.cpp:
(WebCore::JSTestEventTarget::JSTestEventTarget):
* bindings/scripts/test/JS/JSTestEventTarget.h:
* bindings/scripts/test/JS/JSTestException.cpp:
(WebCore::JSTestException::JSTestException):
* bindings/scripts/test/JS/JSTestException.h:
* bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp:
(WebCore::JSTestGenerateIsReachable::JSTestGenerateIsReachable):
* bindings/scripts/test/JS/JSTestGenerateIsReachable.h:
* bindings/scripts/test/JS/JSTestInterface.cpp:
(WebCore::JSTestInterface::JSTestInterface):
* bindings/scripts/test/JS/JSTestInterface.h:
* bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp:
(WebCore::JSTestJSBuiltinConstructor::JSTestJSBuiltinConstructor):
* bindings/scripts/test/JS/JSTestJSBuiltinConstructor.h:
* bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
(WebCore::JSTestMediaQueryListListener::JSTestMediaQueryListListener):
* bindings/scripts/test/JS/JSTestMediaQueryListListener.h:
* bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
(WebCore::JSTestNamedConstructor::JSTestNamedConstructor):
* bindings/scripts/test/JS/JSTestNamedConstructor.h:
* bindings/scripts/test/JS/JSTestNondeterministic.cpp:
(WebCore::JSTestNondeterministic::JSTestNondeterministic):
* bindings/scripts/test/JS/JSTestNondeterministic.h:
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::JSTestObj::JSTestObj):
* bindings/scripts/test/JS/JSTestObj.h:
* bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
(WebCore::JSTestOverloadedConstructors::JSTestOverloadedConstructors):
* bindings/scripts/test/JS/JSTestOverloadedConstructors.h:
* bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
(WebCore::JSTestOverrideBuiltins::JSTestOverrideBuiltins):
* bindings/scripts/test/JS/JSTestOverrideBuiltins.h:
* bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
(WebCore::JSTestSerializedScriptValueInterface::JSTestSerializedScriptValueInterface):
* bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h:
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
(WebCore::JSTestTypedefs::JSTestTypedefs):
* bindings/scripts/test/JS/JSTestTypedefs.h:
* bindings/scripts/test/JS/JSattribute.cpp:
(WebCore::JSattribute::JSattribute):
* bindings/scripts/test/JS/JSattribute.h:
* bindings/scripts/test/JS/JSreadonly.cpp:
(WebCore::JSreadonly::JSreadonly):
* bindings/scripts/test/JS/JSreadonly.h:
* dom/make_names.pl:
(printWrapperFunctions):
(printWrapperFactoryCppFile):
(printWrapperFactoryHeaderFile):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@191060 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d8c3f325..e3a0c6e 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,98 @@
+2015-10-14 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Rename JSDOMWrapper to JSDOMObject and JSDOMWrapperWithImplementation to JSDOMWrapper
+ https://bugs.webkit.org/show_bug.cgi?id=150120
+
+ Reviewed by Sam Weinig.
+
+ No change in behavior.
+
+ * bindings/js/DOMWrapperWorld.h:
+ * bindings/js/JSDOMBinding.h:
+ (WebCore::DOMConstructorObject::DOMConstructorObject):
+ (WebCore::getInlineCachedWrapper):
+ (WebCore::setInlineCachedWrapper):
+ (WebCore::clearInlineCachedWrapper):
+ (WebCore::createWrapper):
+ (WebCore::getStaticValueSlotEntryWithoutCaching<JSDOMObject>):
+ * bindings/js/JSDOMWrapper.cpp:
+ * bindings/js/JSDOMWrapper.h:
+ (WebCore::JSDOMObject::JSDOMObject):
+ (WebCore::JSDOMWrapper::~JSDOMWrapper):
+ (WebCore::JSDOMWrapper::JSDOMWrapper):
+ * bindings/js/JSElementCustom.cpp:
+ (WebCore::toJSNewlyCreated):
+ * bindings/js/JSNodeCustom.cpp:
+ (WebCore::createWrapperInline):
+ * bindings/js/ScriptWrappable.h:
+ * bindings/js/ScriptWrappableInlines.h:
+ (WebCore::ScriptWrappable::wrapper):
+ (WebCore::ScriptWrappable::setWrapper):
+ (WebCore::ScriptWrappable::clearWrapper):
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GetParentClassName):
+ * bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
+ (WebCore::JSTestActiveDOMObject::JSTestActiveDOMObject):
+ * bindings/scripts/test/JS/JSTestActiveDOMObject.h:
+ * bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp:
+ (WebCore::JSTestCustomConstructorWithNoInterfaceObject::JSTestCustomConstructorWithNoInterfaceObject):
+ * bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.h:
+ * bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
+ (WebCore::JSTestCustomNamedGetter::JSTestCustomNamedGetter):
+ * bindings/scripts/test/JS/JSTestCustomNamedGetter.h:
+ * bindings/scripts/test/JS/JSTestEventConstructor.cpp:
+ (WebCore::JSTestEventConstructor::JSTestEventConstructor):
+ * bindings/scripts/test/JS/JSTestEventConstructor.h:
+ * bindings/scripts/test/JS/JSTestEventTarget.cpp:
+ (WebCore::JSTestEventTarget::JSTestEventTarget):
+ * bindings/scripts/test/JS/JSTestEventTarget.h:
+ * bindings/scripts/test/JS/JSTestException.cpp:
+ (WebCore::JSTestException::JSTestException):
+ * bindings/scripts/test/JS/JSTestException.h:
+ * bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp:
+ (WebCore::JSTestGenerateIsReachable::JSTestGenerateIsReachable):
+ * bindings/scripts/test/JS/JSTestGenerateIsReachable.h:
+ * bindings/scripts/test/JS/JSTestInterface.cpp:
+ (WebCore::JSTestInterface::JSTestInterface):
+ * bindings/scripts/test/JS/JSTestInterface.h:
+ * bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp:
+ (WebCore::JSTestJSBuiltinConstructor::JSTestJSBuiltinConstructor):
+ * bindings/scripts/test/JS/JSTestJSBuiltinConstructor.h:
+ * bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
+ (WebCore::JSTestMediaQueryListListener::JSTestMediaQueryListListener):
+ * bindings/scripts/test/JS/JSTestMediaQueryListListener.h:
+ * bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
+ (WebCore::JSTestNamedConstructor::JSTestNamedConstructor):
+ * bindings/scripts/test/JS/JSTestNamedConstructor.h:
+ * bindings/scripts/test/JS/JSTestNondeterministic.cpp:
+ (WebCore::JSTestNondeterministic::JSTestNondeterministic):
+ * bindings/scripts/test/JS/JSTestNondeterministic.h:
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::JSTestObj::JSTestObj):
+ * bindings/scripts/test/JS/JSTestObj.h:
+ * bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
+ (WebCore::JSTestOverloadedConstructors::JSTestOverloadedConstructors):
+ * bindings/scripts/test/JS/JSTestOverloadedConstructors.h:
+ * bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
+ (WebCore::JSTestOverrideBuiltins::JSTestOverrideBuiltins):
+ * bindings/scripts/test/JS/JSTestOverrideBuiltins.h:
+ * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
+ (WebCore::JSTestSerializedScriptValueInterface::JSTestSerializedScriptValueInterface):
+ * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h:
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+ (WebCore::JSTestTypedefs::JSTestTypedefs):
+ * bindings/scripts/test/JS/JSTestTypedefs.h:
+ * bindings/scripts/test/JS/JSattribute.cpp:
+ (WebCore::JSattribute::JSattribute):
+ * bindings/scripts/test/JS/JSattribute.h:
+ * bindings/scripts/test/JS/JSreadonly.cpp:
+ (WebCore::JSreadonly::JSreadonly):
+ * bindings/scripts/test/JS/JSreadonly.h:
+ * dom/make_names.pl:
+ (printWrapperFunctions):
+ (printWrapperFactoryCppFile):
+ (printWrapperFactoryHeaderFile):
+
2015-10-14 Simon Fraser <simon.fraser@apple.com>
Change GraphicsContext image-drawing functions to take references
diff --git a/Source/WebCore/bindings/js/DOMWrapperWorld.h b/Source/WebCore/bindings/js/DOMWrapperWorld.h
index f04883c..e858b55 100644
--- a/Source/WebCore/bindings/js/DOMWrapperWorld.h
+++ b/Source/WebCore/bindings/js/DOMWrapperWorld.h
@@ -28,7 +28,6 @@
namespace WebCore {
class CSSValue;
-class JSDOMWrapper;
class ScriptController;
typedef HashMap<void*, JSC::Weak<JSC::JSObject>> DOMObjectWrapperMap;
diff --git a/Source/WebCore/bindings/js/JSDOMBinding.h b/Source/WebCore/bindings/js/JSDOMBinding.h
index 8b9b1cc..c64a1e7 100644
--- a/Source/WebCore/bindings/js/JSDOMBinding.h
+++ b/Source/WebCore/bindings/js/JSDOMBinding.h
@@ -86,9 +86,9 @@
WEBCORE_EXPORT JSC::EncodedJSValue throwThisTypeError(JSC::ExecState&, const char* interfaceName, const char* functionName);
// Base class for all constructor objects in the JSC bindings.
-class DOMConstructorObject : public JSDOMWrapper {
+class DOMConstructorObject : public JSDOMObject {
public:
- typedef JSDOMWrapper Base;
+ typedef JSDOMObject Base;
static const unsigned StructureFlags = Base::StructureFlags | JSC::ImplementsHasInstance;
static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject* globalObject, JSC::JSValue prototype)
@@ -98,7 +98,7 @@
protected:
DOMConstructorObject(JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- : JSDOMWrapper(structure, globalObject)
+ : JSDOMObject(structure, globalObject)
{
}
};
@@ -163,11 +163,11 @@
return static_cast<WebCoreTypedArrayController*>(world.vm().m_typedArrayController.get())->wrapperOwner();
}
-inline JSDOMWrapper* getInlineCachedWrapper(DOMWrapperWorld&, void*) { return nullptr; }
-inline bool setInlineCachedWrapper(DOMWrapperWorld&, void*, JSDOMWrapper*, JSC::WeakHandleOwner*) { return false; }
-inline bool clearInlineCachedWrapper(DOMWrapperWorld&, void*, JSDOMWrapper*) { return false; }
+inline JSDOMObject* getInlineCachedWrapper(DOMWrapperWorld&, void*) { return nullptr; }
+inline bool setInlineCachedWrapper(DOMWrapperWorld&, void*, JSDOMObject*, JSC::WeakHandleOwner*) { return false; }
+inline bool clearInlineCachedWrapper(DOMWrapperWorld&, void*, JSDOMObject*) { return false; }
-inline JSDOMWrapper* getInlineCachedWrapper(DOMWrapperWorld& world, ScriptWrappable* domObject)
+inline JSDOMObject* getInlineCachedWrapper(DOMWrapperWorld& world, ScriptWrappable* domObject)
{
if (!world.isNormal())
return nullptr;
@@ -181,7 +181,7 @@
return buffer->m_wrapper.get();
}
-inline bool setInlineCachedWrapper(DOMWrapperWorld& world, ScriptWrappable* domObject, JSDOMWrapper* wrapper, JSC::WeakHandleOwner* wrapperOwner)
+inline bool setInlineCachedWrapper(DOMWrapperWorld& world, ScriptWrappable* domObject, JSDOMObject* wrapper, JSC::WeakHandleOwner* wrapperOwner)
{
if (!world.isNormal())
return false;
@@ -197,7 +197,7 @@
return true;
}
-inline bool clearInlineCachedWrapper(DOMWrapperWorld& world, ScriptWrappable* domObject, JSDOMWrapper* wrapper)
+inline bool clearInlineCachedWrapper(DOMWrapperWorld& world, ScriptWrappable* domObject, JSDOMObject* wrapper)
{
if (!world.isNormal())
return false;
@@ -236,7 +236,7 @@
}
#define CREATE_DOM_WRAPPER(globalObject, className, object) createWrapper<JS##className>(globalObject, static_cast<className*>(object))
-template<typename WrapperClass, typename DOMClass> inline JSDOMWrapper* createWrapper(JSDOMGlobalObject* globalObject, DOMClass* node)
+template<typename WrapperClass, typename DOMClass> inline JSDOMObject* createWrapper(JSDOMGlobalObject* globalObject, DOMClass* node)
{
ASSERT(node);
ASSERT(!getCachedWrapper(globalObject->world(), node));
@@ -645,7 +645,7 @@
return entry;
}
-template<> inline const JSC::HashTableValue* getStaticValueSlotEntryWithoutCaching<JSDOMWrapper>(JSC::ExecState*, JSC::PropertyName)
+template<> inline const JSC::HashTableValue* getStaticValueSlotEntryWithoutCaching<JSDOMObject>(JSC::ExecState*, JSC::PropertyName)
{
return nullptr;
}
diff --git a/Source/WebCore/bindings/js/JSDOMWrapper.cpp b/Source/WebCore/bindings/js/JSDOMWrapper.cpp
index 3145a3e..45ac21d 100644
--- a/Source/WebCore/bindings/js/JSDOMWrapper.cpp
+++ b/Source/WebCore/bindings/js/JSDOMWrapper.cpp
@@ -33,6 +33,6 @@
namespace WebCore {
-STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSDOMWrapper);
+STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSDOMObject);
} // namespace WebCore
diff --git a/Source/WebCore/bindings/js/JSDOMWrapper.h b/Source/WebCore/bindings/js/JSDOMWrapper.h
index 05153d7..e49415e 100644
--- a/Source/WebCore/bindings/js/JSDOMWrapper.h
+++ b/Source/WebCore/bindings/js/JSDOMWrapper.h
@@ -33,7 +33,7 @@
static const uint8_t JSDocumentWrapperType = JSC::LastJSCObjectType + 2;
static const uint8_t JSElementType = JSC::LastJSCObjectType + 3;
-class JSDOMWrapper : public JSC::JSDestructibleObject {
+class JSDOMObject : public JSC::JSDestructibleObject {
public:
typedef JSC::JSDestructibleObject Base;
@@ -41,22 +41,22 @@
ScriptExecutionContext* scriptExecutionContext() const { return globalObject()->scriptExecutionContext(); }
protected:
- JSDOMWrapper(JSC::Structure* structure, JSC::JSGlobalObject& globalObject)
+ JSDOMObject(JSC::Structure* structure, JSC::JSGlobalObject& globalObject)
: Base(globalObject.vm(), structure)
{
ASSERT(scriptExecutionContext());
}
};
-template<typename ImplementationClass> class JSDOMWrapperWithImplementation : public JSDOMWrapper {
+template<typename ImplementationClass> class JSDOMWrapper : public JSDOMObject {
public:
- typedef JSDOMWrapper Base;
+ typedef JSDOMObject Base;
ImplementationClass& impl() const { return *m_impl; }
- ~JSDOMWrapperWithImplementation() { std::exchange(m_impl, nullptr)->deref(); }
+ ~JSDOMWrapper() { std::exchange(m_impl, nullptr)->deref(); }
protected:
- JSDOMWrapperWithImplementation(JSC::Structure* structure, JSC::JSGlobalObject& globalObject, Ref<ImplementationClass>&& impl)
+ JSDOMWrapper(JSC::Structure* structure, JSC::JSGlobalObject& globalObject, Ref<ImplementationClass>&& impl)
: Base(structure, globalObject)
, m_impl(&impl.leakRef()) { }
diff --git a/Source/WebCore/bindings/js/JSElementCustom.cpp b/Source/WebCore/bindings/js/JSElementCustom.cpp
index 72dd38e..fefde35 100644
--- a/Source/WebCore/bindings/js/JSElementCustom.cpp
+++ b/Source/WebCore/bindings/js/JSElementCustom.cpp
@@ -56,7 +56,7 @@
ASSERT(!getCachedWrapper(globalObject->world(), element));
- JSDOMWrapper* wrapper;
+ JSDOMObject* wrapper;
if (is<HTMLElement>(*element))
wrapper = createJSHTMLWrapper(globalObject, downcast<HTMLElement>(element));
else if (is<SVGElement>(*element))
diff --git a/Source/WebCore/bindings/js/JSNodeCustom.cpp b/Source/WebCore/bindings/js/JSNodeCustom.cpp
index 816f433..2c1a9f8 100644
--- a/Source/WebCore/bindings/js/JSNodeCustom.cpp
+++ b/Source/WebCore/bindings/js/JSNodeCustom.cpp
@@ -168,7 +168,7 @@
ASSERT(node);
ASSERT(!getCachedWrapper(globalObject->world(), node));
- JSDOMWrapper* wrapper;
+ JSDOMObject* wrapper;
switch (node->nodeType()) {
case Node::ELEMENT_NODE:
if (is<HTMLElement>(*node))
diff --git a/Source/WebCore/bindings/js/ScriptWrappable.h b/Source/WebCore/bindings/js/ScriptWrappable.h
index bfc6872..5d93261 100644
--- a/Source/WebCore/bindings/js/ScriptWrappable.h
+++ b/Source/WebCore/bindings/js/ScriptWrappable.h
@@ -40,19 +40,19 @@
namespace WebCore {
-class JSDOMWrapper;
+class JSDOMObject;
class ScriptWrappable {
public:
- JSDOMWrapper* wrapper() const;
- void setWrapper(JSDOMWrapper*, JSC::WeakHandleOwner*, void*);
- void clearWrapper(JSDOMWrapper*);
+ JSDOMObject* wrapper() const;
+ void setWrapper(JSDOMObject*, JSC::WeakHandleOwner*, void*);
+ void clearWrapper(JSDOMObject*);
protected:
~ScriptWrappable() { }
private:
- JSC::Weak<JSDOMWrapper> m_wrapper;
+ JSC::Weak<JSDOMObject> m_wrapper;
};
} // namespace WebCore
diff --git a/Source/WebCore/bindings/js/ScriptWrappableInlines.h b/Source/WebCore/bindings/js/ScriptWrappableInlines.h
index dabb657..8a53373 100644
--- a/Source/WebCore/bindings/js/ScriptWrappableInlines.h
+++ b/Source/WebCore/bindings/js/ScriptWrappableInlines.h
@@ -38,18 +38,18 @@
namespace WebCore {
-inline JSDOMWrapper* ScriptWrappable::wrapper() const
+inline JSDOMObject* ScriptWrappable::wrapper() const
{
return m_wrapper.get();
}
-inline void ScriptWrappable::setWrapper(JSDOMWrapper* wrapper, JSC::WeakHandleOwner* wrapperOwner, void* context)
+inline void ScriptWrappable::setWrapper(JSDOMObject* wrapper, JSC::WeakHandleOwner* wrapperOwner, void* context)
{
ASSERT(!m_wrapper);
- m_wrapper = JSC::Weak<JSDOMWrapper>(wrapper, wrapperOwner, context);
+ m_wrapper = JSC::Weak<JSDOMObject>(wrapper, wrapperOwner, context);
}
-inline void ScriptWrappable::clearWrapper(JSDOMWrapper* wrapper)
+inline void ScriptWrappable::clearWrapper(JSDOMObject* wrapper)
{
weakClear(m_wrapper, wrapper);
}
diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
index 4dd87dc..38401eb 100644
--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -180,8 +180,8 @@
my $interface = shift;
return $interface->extendedAttributes->{"JSLegacyParent"} if $interface->extendedAttributes->{"JSLegacyParent"};
- return "JSDOMWrapper" unless NeedsImplementationClass($interface);
- return "JSDOMWrapperWithImplementation<" . GetImplClassName($interface->name) . ">" unless $interface->parent;
+ return "JSDOMObject" unless NeedsImplementationClass($interface);
+ return "JSDOMWrapper<" . GetImplClassName($interface->name) . ">" unless $interface->parent;
return "JS" . $interface->parent;
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp
index 5191df9..ba9b934 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp
@@ -139,7 +139,7 @@
const ClassInfo JSTestActiveDOMObject::s_info = { "TestActiveDOMObject", &Base::s_info, &JSTestActiveDOMObjectTable, CREATE_METHOD_TABLE(JSTestActiveDOMObject) };
JSTestActiveDOMObject::JSTestActiveDOMObject(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestActiveDOMObject>&& impl)
- : JSDOMWrapperWithImplementation<TestActiveDOMObject>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestActiveDOMObject>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h b/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h
index 839fcaa..5399227 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.h
@@ -27,9 +27,9 @@
namespace WebCore {
-class JSTestActiveDOMObject : public JSDOMWrapperWithImplementation<TestActiveDOMObject> {
+class JSTestActiveDOMObject : public JSDOMWrapper<TestActiveDOMObject> {
public:
- typedef JSDOMWrapperWithImplementation<TestActiveDOMObject> Base;
+ typedef JSDOMWrapper<TestActiveDOMObject> Base;
static JSTestActiveDOMObject* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestActiveDOMObject>&& impl)
{
JSTestActiveDOMObject* ptr = new (NotNull, JSC::allocateCell<JSTestActiveDOMObject>(globalObject->vm().heap)) JSTestActiveDOMObject(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp
index 58519b6..74732f7 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp
@@ -127,7 +127,7 @@
const ClassInfo JSTestCustomConstructorWithNoInterfaceObject::s_info = { "TestCustomConstructorWithNoInterfaceObject", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestCustomConstructorWithNoInterfaceObject) };
JSTestCustomConstructorWithNoInterfaceObject::JSTestCustomConstructorWithNoInterfaceObject(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestCustomConstructorWithNoInterfaceObject>&& impl)
- : JSDOMWrapperWithImplementation<TestCustomConstructorWithNoInterfaceObject>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestCustomConstructorWithNoInterfaceObject>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.h b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.h
index daa2090..26fc4cb 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.h
@@ -27,9 +27,9 @@
namespace WebCore {
-class JSTestCustomConstructorWithNoInterfaceObject : public JSDOMWrapperWithImplementation<TestCustomConstructorWithNoInterfaceObject> {
+class JSTestCustomConstructorWithNoInterfaceObject : public JSDOMWrapper<TestCustomConstructorWithNoInterfaceObject> {
public:
- typedef JSDOMWrapperWithImplementation<TestCustomConstructorWithNoInterfaceObject> Base;
+ typedef JSDOMWrapper<TestCustomConstructorWithNoInterfaceObject> Base;
static JSTestCustomConstructorWithNoInterfaceObject* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestCustomConstructorWithNoInterfaceObject>&& impl)
{
JSTestCustomConstructorWithNoInterfaceObject* ptr = new (NotNull, JSC::allocateCell<JSTestCustomConstructorWithNoInterfaceObject>(globalObject->vm().heap)) JSTestCustomConstructorWithNoInterfaceObject(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp
index 96e8a5e..90ccba4 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp
@@ -133,7 +133,7 @@
const ClassInfo JSTestCustomNamedGetter::s_info = { "TestCustomNamedGetter", &Base::s_info, &JSTestCustomNamedGetterTable, CREATE_METHOD_TABLE(JSTestCustomNamedGetter) };
JSTestCustomNamedGetter::JSTestCustomNamedGetter(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestCustomNamedGetter>&& impl)
- : JSDOMWrapperWithImplementation<TestCustomNamedGetter>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestCustomNamedGetter>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h
index f5e7c66..90fabec 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.h
@@ -27,9 +27,9 @@
namespace WebCore {
-class JSTestCustomNamedGetter : public JSDOMWrapperWithImplementation<TestCustomNamedGetter> {
+class JSTestCustomNamedGetter : public JSDOMWrapper<TestCustomNamedGetter> {
public:
- typedef JSDOMWrapperWithImplementation<TestCustomNamedGetter> Base;
+ typedef JSDOMWrapper<TestCustomNamedGetter> Base;
static JSTestCustomNamedGetter* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestCustomNamedGetter>&& impl)
{
JSTestCustomNamedGetter* ptr = new (NotNull, JSC::allocateCell<JSTestCustomNamedGetter>(globalObject->vm().heap)) JSTestCustomNamedGetter(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp
index b52fafd..9a1faf9 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp
@@ -171,7 +171,7 @@
const ClassInfo JSTestEventConstructor::s_info = { "TestEventConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestEventConstructor) };
JSTestEventConstructor::JSTestEventConstructor(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestEventConstructor>&& impl)
- : JSDOMWrapperWithImplementation<TestEventConstructor>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestEventConstructor>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h b/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h
index b3dda23..9c8d68d 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.h
@@ -29,9 +29,9 @@
class JSDictionary;
-class JSTestEventConstructor : public JSDOMWrapperWithImplementation<TestEventConstructor> {
+class JSTestEventConstructor : public JSDOMWrapper<TestEventConstructor> {
public:
- typedef JSDOMWrapperWithImplementation<TestEventConstructor> Base;
+ typedef JSDOMWrapper<TestEventConstructor> Base;
static JSTestEventConstructor* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestEventConstructor>&& impl)
{
JSTestEventConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestEventConstructor>(globalObject->vm().heap)) JSTestEventConstructor(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp
index 00ac80e..ceeb74e 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp
@@ -145,7 +145,7 @@
const ClassInfo JSTestEventTarget::s_info = { "TestEventTarget", &Base::s_info, &JSTestEventTargetTable, CREATE_METHOD_TABLE(JSTestEventTarget) };
JSTestEventTarget::JSTestEventTarget(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestEventTarget>&& impl)
- : JSDOMWrapperWithImplementation<TestEventTarget>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestEventTarget>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h b/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h
index 6db9664..ad14c23 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.h
@@ -27,9 +27,9 @@
namespace WebCore {
-class JSTestEventTarget : public JSDOMWrapperWithImplementation<TestEventTarget> {
+class JSTestEventTarget : public JSDOMWrapper<TestEventTarget> {
public:
- typedef JSDOMWrapperWithImplementation<TestEventTarget> Base;
+ typedef JSDOMWrapper<TestEventTarget> Base;
static JSTestEventTarget* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestEventTarget>&& impl)
{
globalObject->masqueradesAsUndefinedWatchpoint()->fireAll("Allocated masquerading object");
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp
index 9766a48..07c1d07 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp
@@ -129,7 +129,7 @@
const ClassInfo JSTestException::s_info = { "TestException", &Base::s_info, &JSTestExceptionTable, CREATE_METHOD_TABLE(JSTestException) };
JSTestException::JSTestException(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestException>&& impl)
- : JSDOMWrapperWithImplementation<TestException>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestException>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestException.h b/Source/WebCore/bindings/scripts/test/JS/JSTestException.h
index a49b509..d751ec1 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestException.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestException.h
@@ -28,9 +28,9 @@
namespace WebCore {
-class JSTestException : public JSDOMWrapperWithImplementation<TestException> {
+class JSTestException : public JSDOMWrapper<TestException> {
public:
- typedef JSDOMWrapperWithImplementation<TestException> Base;
+ typedef JSDOMWrapper<TestException> Base;
static JSTestException* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestException>&& impl)
{
JSTestException* ptr = new (NotNull, JSC::allocateCell<JSTestException>(globalObject->vm().heap)) JSTestException(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp
index d28f302..c013b5d 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp
@@ -112,7 +112,7 @@
const ClassInfo JSTestGenerateIsReachable::s_info = { "TestGenerateIsReachable", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestGenerateIsReachable) };
JSTestGenerateIsReachable::JSTestGenerateIsReachable(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestGenerateIsReachable>&& impl)
- : JSDOMWrapperWithImplementation<TestGenerateIsReachable>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestGenerateIsReachable>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.h b/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.h
index 90098b0..d312c64 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.h
@@ -27,9 +27,9 @@
namespace WebCore {
-class JSTestGenerateIsReachable : public JSDOMWrapperWithImplementation<TestGenerateIsReachable> {
+class JSTestGenerateIsReachable : public JSDOMWrapper<TestGenerateIsReachable> {
public:
- typedef JSDOMWrapperWithImplementation<TestGenerateIsReachable> Base;
+ typedef JSDOMWrapper<TestGenerateIsReachable> Base;
static JSTestGenerateIsReachable* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestGenerateIsReachable>&& impl)
{
JSTestGenerateIsReachable* ptr = new (NotNull, JSC::allocateCell<JSTestGenerateIsReachable>(globalObject->vm().heap)) JSTestGenerateIsReachable(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp
index c1fd549..f5bb8e2 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp
@@ -411,7 +411,7 @@
const ClassInfo JSTestInterface::s_info = { "TestInterface", &Base::s_info, &JSTestInterfaceTable, CREATE_METHOD_TABLE(JSTestInterface) };
JSTestInterface::JSTestInterface(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestInterface>&& impl)
- : JSDOMWrapperWithImplementation<TestInterface>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestInterface>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h b/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h
index 6328f2b..b071cb6 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.h
@@ -29,9 +29,9 @@
namespace WebCore {
-class WEBCORE_EXPORT JSTestInterface : public JSDOMWrapperWithImplementation<TestInterface> {
+class WEBCORE_EXPORT JSTestInterface : public JSDOMWrapper<TestInterface> {
public:
- typedef JSDOMWrapperWithImplementation<TestInterface> Base;
+ typedef JSDOMWrapper<TestInterface> Base;
static JSTestInterface* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestInterface>&& impl)
{
JSTestInterface* ptr = new (NotNull, JSC::allocateCell<JSTestInterface>(globalObject->vm().heap)) JSTestInterface(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp
index be3e9c6..468a19b 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp
@@ -130,7 +130,7 @@
const ClassInfo JSTestJSBuiltinConstructor::s_info = { "TestJSBuiltinConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestJSBuiltinConstructor) };
JSTestJSBuiltinConstructor::JSTestJSBuiltinConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : JSDOMWrapper(structure, globalObject) { }
+ : JSDOMObject(structure, globalObject) { }
JSObject* JSTestJSBuiltinConstructor::createPrototype(VM& vm, JSGlobalObject* globalObject)
{
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.h b/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.h
index ea20974..4202942 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.h
@@ -25,9 +25,9 @@
namespace WebCore {
-class JSTestJSBuiltinConstructor : public JSDOMWrapper {
+class JSTestJSBuiltinConstructor : public JSDOMObject {
public:
- typedef JSDOMWrapper Base;
+ typedef JSDOMObject Base;
static JSTestJSBuiltinConstructor* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject)
{
JSTestJSBuiltinConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestJSBuiltinConstructor>(globalObject->vm().heap)) JSTestJSBuiltinConstructor(structure, *globalObject);
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp
index cb41a29..ef956e2 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp
@@ -120,7 +120,7 @@
const ClassInfo JSTestMediaQueryListListener::s_info = { "TestMediaQueryListListener", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestMediaQueryListListener) };
JSTestMediaQueryListListener::JSTestMediaQueryListListener(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestMediaQueryListListener>&& impl)
- : JSDOMWrapperWithImplementation<TestMediaQueryListListener>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestMediaQueryListListener>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h b/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h
index 9977b95..2e27ad0 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.h
@@ -27,9 +27,9 @@
namespace WebCore {
-class JSTestMediaQueryListListener : public JSDOMWrapperWithImplementation<TestMediaQueryListListener> {
+class JSTestMediaQueryListListener : public JSDOMWrapper<TestMediaQueryListListener> {
public:
- typedef JSDOMWrapperWithImplementation<TestMediaQueryListListener> Base;
+ typedef JSDOMWrapper<TestMediaQueryListListener> Base;
static JSTestMediaQueryListListener* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestMediaQueryListListener>&& impl)
{
JSTestMediaQueryListListener* ptr = new (NotNull, JSC::allocateCell<JSTestMediaQueryListListener>(globalObject->vm().heap)) JSTestMediaQueryListListener(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp
index 82ab027..e7450bf 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp
@@ -186,7 +186,7 @@
const ClassInfo JSTestNamedConstructor::s_info = { "TestNamedConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestNamedConstructor) };
JSTestNamedConstructor::JSTestNamedConstructor(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestNamedConstructor>&& impl)
- : JSDOMWrapperWithImplementation<TestNamedConstructor>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestNamedConstructor>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h
index 7f1982f..de40c7c 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.h
@@ -27,9 +27,9 @@
namespace WebCore {
-class JSTestNamedConstructor : public JSDOMWrapperWithImplementation<TestNamedConstructor> {
+class JSTestNamedConstructor : public JSDOMWrapper<TestNamedConstructor> {
public:
- typedef JSDOMWrapperWithImplementation<TestNamedConstructor> Base;
+ typedef JSDOMWrapper<TestNamedConstructor> Base;
static JSTestNamedConstructor* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestNamedConstructor>&& impl)
{
JSTestNamedConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestNamedConstructor>(globalObject->vm().heap)) JSTestNamedConstructor(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp
index 4f42902..488eec9 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp
@@ -141,7 +141,7 @@
const ClassInfo JSTestNondeterministic::s_info = { "TestNondeterministic", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestNondeterministic) };
JSTestNondeterministic::JSTestNondeterministic(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestNondeterministic>&& impl)
- : JSDOMWrapperWithImplementation<TestNondeterministic>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestNondeterministic>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.h b/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.h
index b729d3b..b1d107c 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.h
@@ -27,9 +27,9 @@
namespace WebCore {
-class JSTestNondeterministic : public JSDOMWrapperWithImplementation<TestNondeterministic> {
+class JSTestNondeterministic : public JSDOMWrapper<TestNondeterministic> {
public:
- typedef JSDOMWrapperWithImplementation<TestNondeterministic> Base;
+ typedef JSDOMWrapper<TestNondeterministic> Base;
static JSTestNondeterministic* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestNondeterministic>&& impl)
{
JSTestNondeterministic* ptr = new (NotNull, JSC::allocateCell<JSTestNondeterministic>(globalObject->vm().heap)) JSTestNondeterministic(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
index 3a0882c..ac868c3 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
@@ -727,7 +727,7 @@
const ClassInfo JSTestObj::s_info = { "TestObject", &Base::s_info, &JSTestObjTable, CREATE_METHOD_TABLE(JSTestObj) };
JSTestObj::JSTestObj(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestObj>&& impl)
- : JSDOMWrapperWithImplementation<TestObj>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestObj>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h
index 769f1ee..ef14092 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestObj.h
@@ -27,9 +27,9 @@
namespace WebCore {
-class JSTestObj : public JSDOMWrapperWithImplementation<TestObj> {
+class JSTestObj : public JSDOMWrapper<TestObj> {
public:
- typedef JSDOMWrapperWithImplementation<TestObj> Base;
+ typedef JSDOMWrapper<TestObj> Base;
static JSTestObj* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestObj>&& impl)
{
JSTestObj* ptr = new (NotNull, JSC::allocateCell<JSTestObj>(globalObject->vm().heap)) JSTestObj(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp
index 05ca334..7354f74 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp
@@ -202,7 +202,7 @@
const ClassInfo JSTestOverloadedConstructors::s_info = { "TestOverloadedConstructors", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestOverloadedConstructors) };
JSTestOverloadedConstructors::JSTestOverloadedConstructors(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestOverloadedConstructors>&& impl)
- : JSDOMWrapperWithImplementation<TestOverloadedConstructors>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestOverloadedConstructors>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.h b/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.h
index 139e344..b7b9ea7 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.h
@@ -27,9 +27,9 @@
namespace WebCore {
-class JSTestOverloadedConstructors : public JSDOMWrapperWithImplementation<TestOverloadedConstructors> {
+class JSTestOverloadedConstructors : public JSDOMWrapper<TestOverloadedConstructors> {
public:
- typedef JSDOMWrapperWithImplementation<TestOverloadedConstructors> Base;
+ typedef JSDOMWrapper<TestOverloadedConstructors> Base;
static JSTestOverloadedConstructors* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestOverloadedConstructors>&& impl)
{
JSTestOverloadedConstructors* ptr = new (NotNull, JSC::allocateCell<JSTestOverloadedConstructors>(globalObject->vm().heap)) JSTestOverloadedConstructors(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp
index e89fe1c..d7ea477 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp
@@ -135,7 +135,7 @@
const ClassInfo JSTestOverrideBuiltins::s_info = { "TestOverrideBuiltins", &Base::s_info, &JSTestOverrideBuiltinsTable, CREATE_METHOD_TABLE(JSTestOverrideBuiltins) };
JSTestOverrideBuiltins::JSTestOverrideBuiltins(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestOverrideBuiltins>&& impl)
- : JSDOMWrapperWithImplementation<TestOverrideBuiltins>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestOverrideBuiltins>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.h b/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.h
index 839398d..f7fc3dd 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.h
@@ -27,9 +27,9 @@
namespace WebCore {
-class JSTestOverrideBuiltins : public JSDOMWrapperWithImplementation<TestOverrideBuiltins> {
+class JSTestOverrideBuiltins : public JSDOMWrapper<TestOverrideBuiltins> {
public:
- typedef JSDOMWrapperWithImplementation<TestOverrideBuiltins> Base;
+ typedef JSDOMWrapper<TestOverrideBuiltins> Base;
static JSTestOverrideBuiltins* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestOverrideBuiltins>&& impl)
{
JSTestOverrideBuiltins* ptr = new (NotNull, JSC::allocateCell<JSTestOverrideBuiltins>(globalObject->vm().heap)) JSTestOverrideBuiltins(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp
index ce43e0a..4c7fe0c 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp
@@ -131,7 +131,7 @@
const ClassInfo JSTestSerializedScriptValueInterface::s_info = { "TestSerializedScriptValueInterface", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestSerializedScriptValueInterface) };
JSTestSerializedScriptValueInterface::JSTestSerializedScriptValueInterface(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestSerializedScriptValueInterface>&& impl)
- : JSDOMWrapperWithImplementation<TestSerializedScriptValueInterface>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestSerializedScriptValueInterface>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h b/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h
index f1c8aef..75a725b 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.h
@@ -29,9 +29,9 @@
namespace WebCore {
-class JSTestSerializedScriptValueInterface : public JSDOMWrapperWithImplementation<TestSerializedScriptValueInterface> {
+class JSTestSerializedScriptValueInterface : public JSDOMWrapper<TestSerializedScriptValueInterface> {
public:
- typedef JSDOMWrapperWithImplementation<TestSerializedScriptValueInterface> Base;
+ typedef JSDOMWrapper<TestSerializedScriptValueInterface> Base;
static JSTestSerializedScriptValueInterface* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestSerializedScriptValueInterface>&& impl)
{
JSTestSerializedScriptValueInterface* ptr = new (NotNull, JSC::allocateCell<JSTestSerializedScriptValueInterface>(globalObject->vm().heap)) JSTestSerializedScriptValueInterface(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp
index 9c8654a..822a81f 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp
@@ -215,7 +215,7 @@
const ClassInfo JSTestTypedefs::s_info = { "TestTypedefs", &Base::s_info, &JSTestTypedefsTable, CREATE_METHOD_TABLE(JSTestTypedefs) };
JSTestTypedefs::JSTestTypedefs(Structure* structure, JSDOMGlobalObject& globalObject, Ref<TestTypedefs>&& impl)
- : JSDOMWrapperWithImplementation<TestTypedefs>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<TestTypedefs>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h b/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h
index 8ca776f..1dba8f0 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.h
@@ -27,9 +27,9 @@
namespace WebCore {
-class JSTestTypedefs : public JSDOMWrapperWithImplementation<TestTypedefs> {
+class JSTestTypedefs : public JSDOMWrapper<TestTypedefs> {
public:
- typedef JSDOMWrapperWithImplementation<TestTypedefs> Base;
+ typedef JSDOMWrapper<TestTypedefs> Base;
static JSTestTypedefs* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<TestTypedefs>&& impl)
{
JSTestTypedefs* ptr = new (NotNull, JSC::allocateCell<JSTestTypedefs>(globalObject->vm().heap)) JSTestTypedefs(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp b/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp
index dc5665d..52da682 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp
@@ -116,7 +116,7 @@
const ClassInfo JSattribute::s_info = { "attribute", &Base::s_info, 0, CREATE_METHOD_TABLE(JSattribute) };
JSattribute::JSattribute(Structure* structure, JSDOMGlobalObject& globalObject, Ref<attribute>&& impl)
- : JSDOMWrapperWithImplementation<attribute>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<attribute>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSattribute.h b/Source/WebCore/bindings/scripts/test/JS/JSattribute.h
index f6edce3..94765ff 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSattribute.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSattribute.h
@@ -28,9 +28,9 @@
namespace WebCore {
-class JSattribute : public JSDOMWrapperWithImplementation<attribute> {
+class JSattribute : public JSDOMWrapper<attribute> {
public:
- typedef JSDOMWrapperWithImplementation<attribute> Base;
+ typedef JSDOMWrapper<attribute> Base;
static JSattribute* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<attribute>&& impl)
{
JSattribute* ptr = new (NotNull, JSC::allocateCell<JSattribute>(globalObject->vm().heap)) JSattribute(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp b/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp
index 9d58084..e3f99da 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp
@@ -112,7 +112,7 @@
const ClassInfo JSreadonly::s_info = { "readonly", &Base::s_info, 0, CREATE_METHOD_TABLE(JSreadonly) };
JSreadonly::JSreadonly(Structure* structure, JSDOMGlobalObject& globalObject, Ref<readonly>&& impl)
- : JSDOMWrapperWithImplementation<readonly>(structure, globalObject, WTF::move(impl))
+ : JSDOMWrapper<readonly>(structure, globalObject, WTF::move(impl))
{
}
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h b/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h
index e29a716..b798da8 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h
+++ b/Source/WebCore/bindings/scripts/test/JS/JSreadonly.h
@@ -27,9 +27,9 @@
namespace WebCore {
-class JSreadonly : public JSDOMWrapperWithImplementation<readonly> {
+class JSreadonly : public JSDOMWrapper<readonly> {
public:
- typedef JSDOMWrapperWithImplementation<readonly> Base;
+ typedef JSDOMWrapper<readonly> Base;
static JSreadonly* create(JSC::Structure* structure, JSDOMGlobalObject* globalObject, Ref<readonly>&& impl)
{
JSreadonly* ptr = new (NotNull, JSC::allocateCell<JSreadonly>(globalObject->vm().heap)) JSreadonly(structure, *globalObject, WTF::move(impl));
diff --git a/Source/WebCore/dom/make_names.pl b/Source/WebCore/dom/make_names.pl
index 0d7a36f..d52d3c9 100755
--- a/Source/WebCore/dom/make_names.pl
+++ b/Source/WebCore/dom/make_names.pl
@@ -1103,7 +1103,7 @@
if ($enabledTags{$tagName}{wrapperOnlyIfMediaIsAvailable}) {
print F <<END
-static JSDOMWrapper* create${JSInterfaceName}Wrapper(JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{namespace}Element> element)
+static JSDOMObject* create${JSInterfaceName}Wrapper(JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{namespace}Element> element)
{
if (element->is$parameters{fallbackInterfaceName}())
return CREATE_DOM_WRAPPER(globalObject, $parameters{fallbackInterfaceName}, element.get());
@@ -1114,7 +1114,7 @@
;
} elsif ($enabledTags{$tagName}{settingsConditional}) {
print F <<END
-static JSDOMWrapper* create$enabledTags{$tagName}{interfaceName}Wrapper(JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{namespace}Element> element)
+static JSDOMObject* create$enabledTags{$tagName}{interfaceName}Wrapper(JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{namespace}Element> element)
{
if (element->is$parameters{fallbackInterfaceName}())
return CREATE_DOM_WRAPPER(globalObject, $parameters{fallbackInterfaceName}, element.get());
@@ -1126,7 +1126,7 @@
} elsif ($enabledTags{$tagName}{runtimeConditional}) {
my $runtimeConditional = $enabledTags{$tagName}{runtimeConditional};
print F <<END
-static JSDOMWrapper* create${JSInterfaceName}Wrapper(JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{namespace}Element> element)
+static JSDOMObject* create${JSInterfaceName}Wrapper(JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{namespace}Element> element)
{
if (!RuntimeEnabledFeatures::sharedFeatures().${runtimeConditional}Enabled()) {
ASSERT(!element || element->is$parameters{fallbackInterfaceName}());
@@ -1139,7 +1139,7 @@
;
} else {
print F <<END
-static JSDOMWrapper* create${JSInterfaceName}Wrapper(JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{namespace}Element> element)
+static JSDOMObject* create${JSInterfaceName}Wrapper(JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{namespace}Element> element)
{
return CREATE_DOM_WRAPPER(globalObject, ${JSInterfaceName}, element.get());
}
@@ -1192,7 +1192,7 @@
using namespace $parameters{namespace}Names;
-typedef JSDOMWrapper* (*Create$parameters{namespace}ElementWrapperFunction)(JSDOMGlobalObject*, PassRefPtr<$parameters{namespace}Element>);
+typedef JSDOMObject* (*Create$parameters{namespace}ElementWrapperFunction)(JSDOMGlobalObject*, PassRefPtr<$parameters{namespace}Element>);
END
;
@@ -1245,7 +1245,7 @@
map.add(table[i].name.localName().impl(), table[i].function);
}
-JSDOMWrapper* createJS$parameters{namespace}Wrapper(JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{namespace}Element> element)
+JSDOMObject* createJS$parameters{namespace}Wrapper(JSDOMGlobalObject* globalObject, PassRefPtr<$parameters{namespace}Element> element)
{
static NeverDestroyed<HashMap<AtomicStringImpl*, Create$parameters{namespace}ElementWrapperFunction>> functions;
if (functions.get().isEmpty())
@@ -1283,11 +1283,11 @@
namespace WebCore {
- class JSDOMWrapper;
+ class JSDOMObject;
class JSDOMGlobalObject;
class $parameters{namespace}Element;
- JSDOMWrapper* createJS$parameters{namespace}Wrapper(JSDOMGlobalObject*, PassRefPtr<$parameters{namespace}Element>);
+ JSDOMObject* createJS$parameters{namespace}Wrapper(JSDOMGlobalObject*, PassRefPtr<$parameters{namespace}Element>);
}
