<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191176] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191176">191176</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-10-16 08:56:12 -0700 (Fri, 16 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Binding generator should use templated JSXXConstructor
https://bugs.webkit.org/show_bug.cgi?id=149952
Reviewed by Darin Adler.
Adding constructor templates:
- JSDOMConstructor: usual JS constructors
- JSDOMNamedConstructor: for named constructors
- JSDOMConstructorNotConstructable: for objects that cannot be constructed directly from JS.
Binding generator is using these 3 templates and is generating specializations for construct, initializeProperties and s_info.
These templates may also be used for private or custom constructors as examplified by JSImageConstructor
and JSReadableStream reader and controller private constructors.
Updated binding generator to use those templates.
Updated JSImageConstructor.cpp to use JSDOMNamedConstructor.
Updated default template implementation of JSBuiltinConstructor::createObject.
Updated generated helper routines of binding generator to fit with the templates.
A further patch should remove DOMConstructorWithDocument and DOMConstructorJSBuiltinObject.
Covered by binding tests.
* bindings/js/JSDOMConstructor.h:
(WebCore::JSDOMConstructorNotConstructable::create):
(WebCore::JSDOMConstructorNotConstructable::createStructure):
(WebCore::JSDOMConstructorNotConstructable::JSDOMConstructorNotConstructable):
(WebCore::JSDOMConstructorNotConstructable::initializeProperties):
(WebCore::JSDOMConstructorNotConstructable<JSClass>::finishCreation):
(WebCore::JSDOMConstructor::create):
(WebCore::JSDOMConstructor::createStructure):
(WebCore::JSDOMConstructor::JSDOMConstructor):
(WebCore::JSDOMConstructor::initializeProperties):
(WebCore::JSDOMConstructor<JSClass>::finishCreation):
(WebCore::JSDOMConstructor<JSClass>::getConstructData):
(WebCore::JSDOMNamedConstructor::create):
(WebCore::JSDOMNamedConstructor::createStructure):
(WebCore::JSDOMNamedConstructor::JSDOMNamedConstructor):
(WebCore::JSDOMNamedConstructor::initializeProperties):
(WebCore::JSDOMNamedConstructor<JSClass>::finishCreation):
(WebCore::JSDOMNamedConstructor<JSClass>::getConstructData):
* bindings/js/JSDOMWindowCustom.cpp:
(WebCore::JSDOMWindow::image):
* bindings/js/JSImageConstructor.cpp:
(WebCore::JSImageConstructor::initializeProperties):
(WebCore::JSImageConstructor::construct):
(WebCore::createImageConstructor):
* bindings/js/JSImageConstructor.h:
* bindings/scripts/CodeGeneratorJS.pm:
(GetConstructorTemplateClassName):
(GenerateConstructorDeclaration):
(GenerateOverloadedConstructorDefinition):
(GenerateConstructorDefinition):
(GenerateConstructorHelperMethods):
(GenerateImplementation): Deleted.
(GenerateConstructorDefinitions): Deleted.
(HasCustomSetter): Deleted.
(HasCustomMethod): Deleted.
(NeedsConstructorProperty): Deleted.
(ComputeFunctionSpecial): Deleted.
(AddJSBuiltinIncludesIfNeeded): Deleted.
* bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
(WebCore::JSTestActiveDOMObjectConstructor::initializeProperties):
(WebCore::JSTestActiveDOMObjectPrototype::finishCreation): Deleted.
(WebCore::JSTestActiveDOMObject::JSTestActiveDOMObject): Deleted.
* bindings/scripts/test/JS/JSTestCallback.cpp:
(WebCore::JSTestCallbackConstructor::initializeProperties):
(WebCore::JSTestCallback::callbackWithNoParam): Deleted.
* bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp:
(WebCore::JSTestCustomConstructorWithNoInterfaceObjectConstructor::construct):
(WebCore::JSTestCustomConstructorWithNoInterfaceObjectConstructor::initializeProperties):
(WebCore::JSTestCustomConstructorWithNoInterfaceObjectPrototype::finishCreation): Deleted.
(WebCore::JSTestCustomConstructorWithNoInterfaceObject::JSTestCustomConstructorWithNoInterfaceObject): Deleted.
(WebCore::JSTestCustomConstructorWithNoInterfaceObject::createPrototype): Deleted.
(WebCore::JSTestCustomConstructorWithNoInterfaceObject::getPrototype): Deleted.
(WebCore::JSTestCustomConstructorWithNoInterfaceObject::destroy): Deleted.
* bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
(WebCore::JSTestCustomNamedGetterConstructor::initializeProperties):
(WebCore::JSTestCustomNamedGetterPrototype::finishCreation): Deleted.
(WebCore::JSTestCustomNamedGetter::JSTestCustomNamedGetter): Deleted.
* bindings/scripts/test/JS/JSTestEventConstructor.cpp:
(WebCore::JSTestEventConstructorConstructor::construct):
(WebCore::JSTestEventConstructorConstructor::initializeProperties):
(WebCore::JSTestEventConstructorPrototype::finishCreation): Deleted.
(WebCore::JSTestEventConstructor::JSTestEventConstructor): Deleted.
(WebCore::JSTestEventConstructor::getPrototype): Deleted.
* bindings/scripts/test/JS/JSTestEventTarget.cpp:
(WebCore::JSTestEventTargetConstructor::initializeProperties):
(WebCore::JSTestEventTargetPrototype::finishCreation): Deleted.
* bindings/scripts/test/JS/JSTestException.cpp:
(WebCore::JSTestExceptionConstructor::initializeProperties):
(WebCore::JSTestExceptionPrototype::finishCreation): Deleted.
(WebCore::JSTestException::JSTestException): Deleted.
* bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp:
(WebCore::JSTestGenerateIsReachableConstructor::initializeProperties):
(WebCore::JSTestGenerateIsReachablePrototype::finishCreation): Deleted.
(WebCore::JSTestGenerateIsReachable::JSTestGenerateIsReachable): Deleted.
* bindings/scripts/test/JS/JSTestInterface.cpp:
(WebCore::JSTestInterfaceConstructor::construct):
(WebCore::JSTestInterfaceConstructor::initializeProperties):
(WebCore::JSTestInterfaceConstructor::getConstructData):
* bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp:
(WebCore::JSTestJSBuiltinConstructorConstructor::createJSObject):
(WebCore::JSTestJSBuiltinConstructorConstructor::initializeProperties):
(WebCore::JSTestJSBuiltinConstructorPrototype::finishCreation): Deleted.
(WebCore::JSTestJSBuiltinConstructor::JSTestJSBuiltinConstructor): Deleted.
(WebCore::JSTestJSBuiltinConstructor::createPrototype): Deleted.
(WebCore::JSTestJSBuiltinConstructor::getPrototype): Deleted.
(WebCore::JSTestJSBuiltinConstructor::destroy): Deleted.
* bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
(WebCore::JSTestMediaQueryListListenerConstructor::initializeProperties):
(WebCore::JSTestMediaQueryListListenerPrototype::finishCreation): Deleted.
(WebCore::JSTestMediaQueryListListener::JSTestMediaQueryListListener): Deleted.
* bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
(WebCore::JSTestNamedConstructorConstructor::initializeProperties):
(WebCore::JSTestNamedConstructorNamedConstructor::construct):
(WebCore::JSTestNamedConstructorNamedConstructor::initializeProperties):
(WebCore::JSTestNamedConstructorPrototype::finishCreation): Deleted.
(WebCore::JSTestNamedConstructor::JSTestNamedConstructor): Deleted.
(WebCore::jsTestNamedConstructorConstructor): Deleted.
(WebCore::JSTestNamedConstructor::getConstructor): Deleted.
(WebCore::JSTestNamedConstructorOwner::isReachableFromOpaqueRoots): Deleted.
* bindings/scripts/test/JS/JSTestNode.cpp:
(WebCore::JSTestNodeConstructor::construct):
(WebCore::JSTestNodeConstructor::initializeProperties):
(WebCore::JSTestNodePrototype::finishCreation): Deleted.
(WebCore::JSTestNode::JSTestNode): Deleted.
(WebCore::JSTestNode::getPrototype): Deleted.
* bindings/scripts/test/JS/JSTestNondeterministic.cpp:
(WebCore::JSTestNondeterministicConstructor::initializeProperties):
(WebCore::JSTestNondeterministicPrototype::finishCreation): Deleted.
* bindings/scripts/test/JS/JSTestObj.cpp:
(WebCore::JSTestObjConstructor::construct):
(WebCore::JSTestObjConstructor::initializeProperties):
* bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
(WebCore::JSTestOverloadedConstructorsConstructor::construct):
(WebCore::JSTestOverloadedConstructorsConstructor::initializeProperties):
(WebCore::constructJSTestOverloadedConstructors1): Deleted.
(WebCore::constructJSTestOverloadedConstructors2): Deleted.
(WebCore::JSTestOverloadedConstructorsPrototype::finishCreation): Deleted.
(WebCore::JSTestOverloadedConstructors::JSTestOverloadedConstructors): Deleted.
(WebCore::JSTestOverloadedConstructors::createPrototype): Deleted.
(WebCore::JSTestOverloadedConstructors::getPrototype): Deleted.
(WebCore::JSTestOverloadedConstructors::destroy): Deleted.
* bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
(WebCore::JSTestOverrideBuiltinsConstructor::initializeProperties):
(WebCore::JSTestOverrideBuiltinsPrototype::finishCreation): Deleted.
(WebCore::JSTestOverrideBuiltins::JSTestOverrideBuiltins): Deleted.
* bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
(WebCore::JSTestSerializedScriptValueInterfaceConstructor::initializeProperties):
(WebCore::JSTestSerializedScriptValueInterfacePrototype::finishCreation): Deleted.
* bindings/scripts/test/JS/JSTestTypedefs.cpp:
(WebCore::JSTestTypedefsConstructor::construct):
(WebCore::JSTestTypedefsConstructor::initializeProperties):
(WebCore::JSTestTypedefsPrototype::finishCreation): Deleted.
* bindings/scripts/test/JS/JSattribute.cpp:
(WebCore::JSattributeConstructor::initializeProperties):
(WebCore::JSattributePrototype::finishCreation): Deleted.
(WebCore::JSattribute::JSattribute): Deleted.
* bindings/scripts/test/JS/JSreadonly.cpp:
(WebCore::JSreadonlyConstructor::initializeProperties):
(WebCore::JSreadonlyPrototype::finishCreation): Deleted.
(WebCore::JSreadonly::JSreadonly): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMConstructorh">trunk/Source/WebCore/bindings/js/JSDOMConstructor.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSImageConstructorcpp">trunk/Source/WebCore/bindings/js/JSImageConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSImageConstructorh">trunk/Source/WebCore/bindings/js/JSImageConstructor.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSReadableStreamPrivateConstructorscpp">trunk/Source/WebCore/bindings/js/JSReadableStreamPrivateConstructors.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjectcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCallbackcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCustomConstructorWithNoInterfaceObjectcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestCustomNamedGettercpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestEventConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestEventTargetcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestExceptioncpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestGenerateIsReachablecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestJSBuiltinConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestMediaQueryListListenercpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNodecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestNondeterministiccpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestOverrideBuiltinscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfacecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSattributecpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestJSJSreadonlycpp">trunk/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/ChangeLog 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -1,3 +1,169 @@
</span><ins>+2015-10-16 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ Binding generator should use templated JSXXConstructor
+ https://bugs.webkit.org/show_bug.cgi?id=149952
+
+ Reviewed by Darin Adler.
+
+ Adding constructor templates:
+ - JSDOMConstructor: usual JS constructors
+ - JSDOMNamedConstructor: for named constructors
+ - JSDOMConstructorNotConstructable: for objects that cannot be constructed directly from JS.
+
+ Binding generator is using these 3 templates and is generating specializations for construct, initializeProperties and s_info.
+ These templates may also be used for private or custom constructors as examplified by JSImageConstructor
+ and JSReadableStream reader and controller private constructors.
+
+ Updated binding generator to use those templates.
+ Updated JSImageConstructor.cpp to use JSDOMNamedConstructor.
+ Updated default template implementation of JSBuiltinConstructor::createObject.
+ Updated generated helper routines of binding generator to fit with the templates.
+
+ A further patch should remove DOMConstructorWithDocument and DOMConstructorJSBuiltinObject.
+
+ Covered by binding tests.
+
+ * bindings/js/JSDOMConstructor.h:
+ (WebCore::JSDOMConstructorNotConstructable::create):
+ (WebCore::JSDOMConstructorNotConstructable::createStructure):
+ (WebCore::JSDOMConstructorNotConstructable::JSDOMConstructorNotConstructable):
+ (WebCore::JSDOMConstructorNotConstructable::initializeProperties):
+ (WebCore::JSDOMConstructorNotConstructable<JSClass>::finishCreation):
+ (WebCore::JSDOMConstructor::create):
+ (WebCore::JSDOMConstructor::createStructure):
+ (WebCore::JSDOMConstructor::JSDOMConstructor):
+ (WebCore::JSDOMConstructor::initializeProperties):
+ (WebCore::JSDOMConstructor<JSClass>::finishCreation):
+ (WebCore::JSDOMConstructor<JSClass>::getConstructData):
+ (WebCore::JSDOMNamedConstructor::create):
+ (WebCore::JSDOMNamedConstructor::createStructure):
+ (WebCore::JSDOMNamedConstructor::JSDOMNamedConstructor):
+ (WebCore::JSDOMNamedConstructor::initializeProperties):
+ (WebCore::JSDOMNamedConstructor<JSClass>::finishCreation):
+ (WebCore::JSDOMNamedConstructor<JSClass>::getConstructData):
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::JSDOMWindow::image):
+ * bindings/js/JSImageConstructor.cpp:
+ (WebCore::JSImageConstructor::initializeProperties):
+ (WebCore::JSImageConstructor::construct):
+ (WebCore::createImageConstructor):
+ * bindings/js/JSImageConstructor.h:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GetConstructorTemplateClassName):
+ (GenerateConstructorDeclaration):
+ (GenerateOverloadedConstructorDefinition):
+ (GenerateConstructorDefinition):
+ (GenerateConstructorHelperMethods):
+ (GenerateImplementation): Deleted.
+ (GenerateConstructorDefinitions): Deleted.
+ (HasCustomSetter): Deleted.
+ (HasCustomMethod): Deleted.
+ (NeedsConstructorProperty): Deleted.
+ (ComputeFunctionSpecial): Deleted.
+ (AddJSBuiltinIncludesIfNeeded): Deleted.
+ * bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
+ (WebCore::JSTestActiveDOMObjectConstructor::initializeProperties):
+ (WebCore::JSTestActiveDOMObjectPrototype::finishCreation): Deleted.
+ (WebCore::JSTestActiveDOMObject::JSTestActiveDOMObject): Deleted.
+ * bindings/scripts/test/JS/JSTestCallback.cpp:
+ (WebCore::JSTestCallbackConstructor::initializeProperties):
+ (WebCore::JSTestCallback::callbackWithNoParam): Deleted.
+ * bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp:
+ (WebCore::JSTestCustomConstructorWithNoInterfaceObjectConstructor::construct):
+ (WebCore::JSTestCustomConstructorWithNoInterfaceObjectConstructor::initializeProperties):
+ (WebCore::JSTestCustomConstructorWithNoInterfaceObjectPrototype::finishCreation): Deleted.
+ (WebCore::JSTestCustomConstructorWithNoInterfaceObject::JSTestCustomConstructorWithNoInterfaceObject): Deleted.
+ (WebCore::JSTestCustomConstructorWithNoInterfaceObject::createPrototype): Deleted.
+ (WebCore::JSTestCustomConstructorWithNoInterfaceObject::getPrototype): Deleted.
+ (WebCore::JSTestCustomConstructorWithNoInterfaceObject::destroy): Deleted.
+ * bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp:
+ (WebCore::JSTestCustomNamedGetterConstructor::initializeProperties):
+ (WebCore::JSTestCustomNamedGetterPrototype::finishCreation): Deleted.
+ (WebCore::JSTestCustomNamedGetter::JSTestCustomNamedGetter): Deleted.
+ * bindings/scripts/test/JS/JSTestEventConstructor.cpp:
+ (WebCore::JSTestEventConstructorConstructor::construct):
+ (WebCore::JSTestEventConstructorConstructor::initializeProperties):
+ (WebCore::JSTestEventConstructorPrototype::finishCreation): Deleted.
+ (WebCore::JSTestEventConstructor::JSTestEventConstructor): Deleted.
+ (WebCore::JSTestEventConstructor::getPrototype): Deleted.
+ * bindings/scripts/test/JS/JSTestEventTarget.cpp:
+ (WebCore::JSTestEventTargetConstructor::initializeProperties):
+ (WebCore::JSTestEventTargetPrototype::finishCreation): Deleted.
+ * bindings/scripts/test/JS/JSTestException.cpp:
+ (WebCore::JSTestExceptionConstructor::initializeProperties):
+ (WebCore::JSTestExceptionPrototype::finishCreation): Deleted.
+ (WebCore::JSTestException::JSTestException): Deleted.
+ * bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp:
+ (WebCore::JSTestGenerateIsReachableConstructor::initializeProperties):
+ (WebCore::JSTestGenerateIsReachablePrototype::finishCreation): Deleted.
+ (WebCore::JSTestGenerateIsReachable::JSTestGenerateIsReachable): Deleted.
+ * bindings/scripts/test/JS/JSTestInterface.cpp:
+ (WebCore::JSTestInterfaceConstructor::construct):
+ (WebCore::JSTestInterfaceConstructor::initializeProperties):
+ (WebCore::JSTestInterfaceConstructor::getConstructData):
+ * bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp:
+ (WebCore::JSTestJSBuiltinConstructorConstructor::createJSObject):
+ (WebCore::JSTestJSBuiltinConstructorConstructor::initializeProperties):
+ (WebCore::JSTestJSBuiltinConstructorPrototype::finishCreation): Deleted.
+ (WebCore::JSTestJSBuiltinConstructor::JSTestJSBuiltinConstructor): Deleted.
+ (WebCore::JSTestJSBuiltinConstructor::createPrototype): Deleted.
+ (WebCore::JSTestJSBuiltinConstructor::getPrototype): Deleted.
+ (WebCore::JSTestJSBuiltinConstructor::destroy): Deleted.
+ * bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp:
+ (WebCore::JSTestMediaQueryListListenerConstructor::initializeProperties):
+ (WebCore::JSTestMediaQueryListListenerPrototype::finishCreation): Deleted.
+ (WebCore::JSTestMediaQueryListListener::JSTestMediaQueryListListener): Deleted.
+ * bindings/scripts/test/JS/JSTestNamedConstructor.cpp:
+ (WebCore::JSTestNamedConstructorConstructor::initializeProperties):
+ (WebCore::JSTestNamedConstructorNamedConstructor::construct):
+ (WebCore::JSTestNamedConstructorNamedConstructor::initializeProperties):
+ (WebCore::JSTestNamedConstructorPrototype::finishCreation): Deleted.
+ (WebCore::JSTestNamedConstructor::JSTestNamedConstructor): Deleted.
+ (WebCore::jsTestNamedConstructorConstructor): Deleted.
+ (WebCore::JSTestNamedConstructor::getConstructor): Deleted.
+ (WebCore::JSTestNamedConstructorOwner::isReachableFromOpaqueRoots): Deleted.
+ * bindings/scripts/test/JS/JSTestNode.cpp:
+ (WebCore::JSTestNodeConstructor::construct):
+ (WebCore::JSTestNodeConstructor::initializeProperties):
+ (WebCore::JSTestNodePrototype::finishCreation): Deleted.
+ (WebCore::JSTestNode::JSTestNode): Deleted.
+ (WebCore::JSTestNode::getPrototype): Deleted.
+ * bindings/scripts/test/JS/JSTestNondeterministic.cpp:
+ (WebCore::JSTestNondeterministicConstructor::initializeProperties):
+ (WebCore::JSTestNondeterministicPrototype::finishCreation): Deleted.
+ * bindings/scripts/test/JS/JSTestObj.cpp:
+ (WebCore::JSTestObjConstructor::construct):
+ (WebCore::JSTestObjConstructor::initializeProperties):
+ * bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp:
+ (WebCore::JSTestOverloadedConstructorsConstructor::construct):
+ (WebCore::JSTestOverloadedConstructorsConstructor::initializeProperties):
+ (WebCore::constructJSTestOverloadedConstructors1): Deleted.
+ (WebCore::constructJSTestOverloadedConstructors2): Deleted.
+ (WebCore::JSTestOverloadedConstructorsPrototype::finishCreation): Deleted.
+ (WebCore::JSTestOverloadedConstructors::JSTestOverloadedConstructors): Deleted.
+ (WebCore::JSTestOverloadedConstructors::createPrototype): Deleted.
+ (WebCore::JSTestOverloadedConstructors::getPrototype): Deleted.
+ (WebCore::JSTestOverloadedConstructors::destroy): Deleted.
+ * bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp:
+ (WebCore::JSTestOverrideBuiltinsConstructor::initializeProperties):
+ (WebCore::JSTestOverrideBuiltinsPrototype::finishCreation): Deleted.
+ (WebCore::JSTestOverrideBuiltins::JSTestOverrideBuiltins): Deleted.
+ * bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp:
+ (WebCore::JSTestSerializedScriptValueInterfaceConstructor::initializeProperties):
+ (WebCore::JSTestSerializedScriptValueInterfacePrototype::finishCreation): Deleted.
+ * bindings/scripts/test/JS/JSTestTypedefs.cpp:
+ (WebCore::JSTestTypedefsConstructor::construct):
+ (WebCore::JSTestTypedefsConstructor::initializeProperties):
+ (WebCore::JSTestTypedefsPrototype::finishCreation): Deleted.
+ * bindings/scripts/test/JS/JSattribute.cpp:
+ (WebCore::JSattributeConstructor::initializeProperties):
+ (WebCore::JSattributePrototype::finishCreation): Deleted.
+ (WebCore::JSattribute::JSattribute): Deleted.
+ * bindings/scripts/test/JS/JSreadonly.cpp:
+ (WebCore::JSreadonlyConstructor::initializeProperties):
+ (WebCore::JSreadonlyPrototype::finishCreation): Deleted.
+ (WebCore::JSreadonly::JSreadonly): Deleted.
+
</ins><span class="cx"> 2015-10-16 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] ASSERTION FAILED: !m_adoptionIsRequired in MediaSourceGStreamer::addSourceBuffer
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMConstructorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMConstructor.h (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMConstructor.h 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/js/JSDOMConstructor.h 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -19,59 +19,194 @@
</span><span class="cx"> #ifndef JSDOMConstructor_h
</span><span class="cx"> #define JSDOMConstructor_h
</span><span class="cx">
</span><ins>+#include "DOMConstructorWithDocument.h"
</ins><span class="cx"> #include "JSDOMBinding.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-template <typename JSClass> class JSBuiltinConstructor : public DOMConstructorJSBuiltinObject {
</del><ins>+template<typename JSClass> class JSDOMConstructorNotConstructable : public DOMConstructorObject {
</ins><span class="cx"> public:
</span><del>- typedef DOMConstructorJSBuiltinObject Base;
</del><ins>+ typedef DOMConstructorObject Base;
</ins><span class="cx">
</span><del>- static JSBuiltinConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSBuiltinConstructor* constructor = new (NotNull, JSC::allocateCell<JSBuiltinConstructor>(vm.heap)) JSBuiltinConstructor(structure, globalObject);
- constructor->finishCreation(vm, globalObject);
- return constructor;
- }
</del><ins>+ static JSDOMConstructorNotConstructable* create(JSC::VM&, JSC::Structure*, JSDOMGlobalObject&);
+ static JSC::Structure* createStructure(JSC::VM&, JSC::JSGlobalObject&, JSC::JSValue);
</ins><span class="cx">
</span><del>- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
</del><ins>+ DECLARE_INFO;
</ins><span class="cx">
</span><ins>+private:
+ JSDOMConstructorNotConstructable(JSC::Structure* structure, JSDOMGlobalObject& globalObject) : Base(structure, globalObject) { }
+ void finishCreation(JSC::VM&, JSDOMGlobalObject&);
+
+ // Usually defined for each specialization class.
+ void initializeProperties(JSC::VM&, JSDOMGlobalObject&) { }
+};
+
+template<typename JSClass> class JSDOMConstructor : public DOMConstructorObject {
+public:
+ typedef DOMConstructorObject Base;
+
+ static JSDOMConstructor* create(JSC::VM&, JSC::Structure*, JSDOMGlobalObject&);
+ static JSC::Structure* createStructure(JSC::VM&, JSC::JSGlobalObject&, JSC::JSValue);
+
</ins><span class="cx"> DECLARE_INFO;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- JSBuiltinConstructor(JSC::Structure* structure, JSDOMGlobalObject& globalObject) : Base(structure, globalObject) { }
</del><ins>+ JSDOMConstructor(JSC::Structure* structure, JSDOMGlobalObject& globalObject) : Base(structure, globalObject) { }
+ void finishCreation(JSC::VM&, JSDOMGlobalObject&);
+ static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
</ins><span class="cx">
</span><ins>+ // Usually defined for each specialization class.
+ void initializeProperties(JSC::VM&, JSDOMGlobalObject&) { }
+ // Must be defined for each specialization class.
+ static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);
+};
+
+template<typename JSClass> class JSDOMNamedConstructor : public DOMConstructorWithDocument {
+public:
+ typedef DOMConstructorWithDocument Base;
+
+ static JSDOMNamedConstructor* create(JSC::VM&, JSC::Structure*, JSDOMGlobalObject&);
+ static JSC::Structure* createStructure(JSC::VM&, JSC::JSGlobalObject&, JSC::JSValue);
+
+ DECLARE_INFO;
+
+private:
+ JSDOMNamedConstructor(JSC::Structure* structure, JSDOMGlobalObject& globalObject) : Base(structure, globalObject) { }
</ins><span class="cx"> void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</span><ins>+ static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
+
+ // Usually defined for each specialization class.
</ins><span class="cx"> void initializeProperties(JSC::VM&, JSDOMGlobalObject&) { }
</span><ins>+ // Must be defined for each specialization class.
+ static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);
+};
+
+template<typename JSClass> class JSBuiltinConstructor : public DOMConstructorJSBuiltinObject {
+public:
+ typedef DOMConstructorJSBuiltinObject Base;
+
+ static JSBuiltinConstructor* create(JSC::VM&, JSC::Structure*, JSDOMGlobalObject&);
+ static JSC::Structure* createStructure(JSC::VM&, JSC::JSGlobalObject&, JSC::JSValue);
+
+ DECLARE_INFO;
+
+private:
+ JSBuiltinConstructor(JSC::Structure* structure, JSDOMGlobalObject& globalObject) : Base(structure, globalObject) { }
+ void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</ins><span class="cx"> static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
</span><span class="cx"> static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);
</span><ins>+ JSC::JSObject* createJSObject();
</ins><span class="cx">
</span><ins>+ // Usually defined for each specialization class.
+ void initializeProperties(JSC::VM&, JSDOMGlobalObject&) { }
</ins><span class="cx"> // Must be defined for each specialization class.
</span><del>- JSC::JSFunction* createInitializeFunction(JSC::VM&, JSC::JSGlobalObject&);
- JSC::JSObject* createJSObject();
</del><ins>+ JSC::FunctionExecutable* initializeExecutable(JSC::VM&);
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename JSClass> void JSBuiltinConstructor<JSClass>::finishCreation(JSC::VM& vm, JSDOMGlobalObject& globalObject)
</del><ins>+template<typename JSClass> inline JSDOMConstructorNotConstructable<JSClass>* JSDOMConstructorNotConstructable<JSClass>::create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><ins>+ JSDOMConstructorNotConstructable* constructor = new (NotNull, JSC::allocateCell<JSDOMConstructorNotConstructable>(vm.heap)) JSDOMConstructorNotConstructable(structure, globalObject);
+ constructor->finishCreation(vm, globalObject);
+ return constructor;
+}
+
+template<typename JSClass> inline JSC::Structure* JSDOMConstructorNotConstructable<JSClass>::createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
+{
+ return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
+}
+
+template<typename JSClass> inline void JSDOMConstructorNotConstructable<JSClass>::finishCreation(JSC::VM& vm, JSDOMGlobalObject& globalObject)
+{
</ins><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> ASSERT(inherits(info()));
</span><del>- setInitializeFunction(vm, *createInitializeFunction(vm, globalObject));
</del><span class="cx"> initializeProperties(vm, globalObject);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSClass> JSC::EncodedJSValue JSC_HOST_CALL JSBuiltinConstructor<JSClass>::construct(JSC::ExecState* state)
</del><ins>+template<typename JSClass> inline JSDOMConstructor<JSClass>* JSDOMConstructor<JSClass>::create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><ins>+ JSDOMConstructor* constructor = new (NotNull, JSC::allocateCell<JSDOMConstructor>(vm.heap)) JSDOMConstructor(structure, globalObject);
+ constructor->finishCreation(vm, globalObject);
+ return constructor;
+}
+
+template<typename JSClass> inline JSC::Structure* JSDOMConstructor<JSClass>::createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
+{
+ return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
+}
+
+template<typename JSClass> void JSDOMConstructor<JSClass>::finishCreation(JSC::VM& vm, JSDOMGlobalObject& globalObject)
+{
+ Base::finishCreation(vm);
+ ASSERT(inherits(info()));
+ initializeProperties(vm, globalObject);
+}
+
+template<typename JSClass> JSC::ConstructType JSDOMConstructor<JSClass>::getConstructData(JSC::JSCell*, JSC::ConstructData& constructData)
+{
+ constructData.native.function = construct;
+ return JSC::ConstructTypeHost;
+}
+
+template<typename JSClass> inline JSDOMNamedConstructor<JSClass>* JSDOMNamedConstructor<JSClass>::create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
+{
+ JSDOMNamedConstructor* constructor = new (NotNull, JSC::allocateCell<JSDOMNamedConstructor>(vm.heap)) JSDOMNamedConstructor(structure, globalObject);
+ constructor->finishCreation(vm, globalObject);
+ return constructor;
+}
+
+template<typename JSClass> inline JSC::Structure* JSDOMNamedConstructor<JSClass>::createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
+{
+ return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
+}
+
+template<typename JSClass> inline void JSDOMNamedConstructor<JSClass>::finishCreation(JSC::VM& vm, JSDOMGlobalObject& globalObject)
+{
+ Base::finishCreation(globalObject);
+ ASSERT(inherits(info()));
+ initializeProperties(vm, globalObject);
+}
+
+template<typename JSClass> inline JSC::ConstructType JSDOMNamedConstructor<JSClass>::getConstructData(JSC::JSCell*, JSC::ConstructData& constructData)
+{
+ constructData.native.function = construct;
+ return JSC::ConstructTypeHost;
+}
+
+template<typename JSClass> inline JSBuiltinConstructor<JSClass>* JSBuiltinConstructor<JSClass>::create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
+{
+ JSBuiltinConstructor* constructor = new (NotNull, JSC::allocateCell<JSBuiltinConstructor>(vm.heap)) JSBuiltinConstructor(structure, globalObject);
+ constructor->finishCreation(vm, globalObject);
+ return constructor;
+}
+
+template<typename JSClass> inline JSC::Structure* JSBuiltinConstructor<JSClass>::createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
+{
+ return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
+}
+
+template<typename JSClass> inline void JSBuiltinConstructor<JSClass>::finishCreation(JSC::VM& vm, JSDOMGlobalObject& globalObject)
+{
+ Base::finishCreation(vm);
+ ASSERT(inherits(info()));
+ setInitializeFunction(vm, *JSC::JSFunction::createBuiltinFunction(vm, initializeExecutable(vm), &globalObject));
+ initializeProperties(vm, globalObject);
+}
+
+template<typename JSClass> inline JSC::EncodedJSValue JSC_HOST_CALL JSBuiltinConstructor<JSClass>::construct(JSC::ExecState* state)
+{
</ins><span class="cx"> auto* castedThis = JSC::jsCast<JSBuiltinConstructor*>(state->callee());
</span><del>- JSObject* object = castedThis->createJSObject();
</del><ins>+ auto* object = castedThis->createJSObject();
</ins><span class="cx"> callFunctionWithCurrentArguments(*state, *object, *castedThis->initializeFunction());
</span><span class="cx"> return JSC::JSValue::encode(object);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename JSClass> JSC::ConstructType JSBuiltinConstructor<JSClass>::getConstructData(JSC::JSCell*, JSC::ConstructData& constructData)
</del><ins>+template<typename JSClass> inline JSC::JSObject* JSBuiltinConstructor<JSClass>::createJSObject()
</ins><span class="cx"> {
</span><ins>+ return JSClass::create(getDOMStructure<JSClass>(globalObject()->vm(), *globalObject()), globalObject());
+}
+
+template<typename JSClass> inline JSC::ConstructType JSBuiltinConstructor<JSClass>::getConstructData(JSC::JSCell*, JSC::ConstructData& constructData)
+{
</ins><span class="cx"> constructData.native.function = construct;
</span><span class="cx"> return JSC::ConstructTypeHost;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSDOMWindow::image(ExecState& state) const
</span><span class="cx"> {
</span><del>- return getDOMConstructor<JSImageConstructor>(state.vm(), *this);
</del><ins>+ return createImageConstructor(state.vm(), *this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSImageConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSImageConstructor.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSImageConstructor.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/js/JSImageConstructor.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSImageConstructor.h"
</span><span class="cx">
</span><del>-#include "HTMLImageElement.h"
</del><span class="cx"> #include "HTMLNames.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "JSHTMLImageElement.h"
</span><span class="cx"> #include "JSNode.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="lines">@@ -30,54 +30,48 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+typedef JSDOMNamedConstructor<JSHTMLImageElement> JSImageConstructor;
+
</ins><span class="cx"> STATIC_ASSERT_IS_TRIVIALLY_DESTRUCTIBLE(JSImageConstructor);
</span><span class="cx">
</span><del>-const ClassInfo JSImageConstructor::s_info = { "ImageConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSImageConstructor) };
-
-JSImageConstructor::JSImageConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : DOMConstructorWithDocument(structure, globalObject)
</del><ins>+template<> void JSImageConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSImageConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(globalObject);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSHTMLImageElement::getPrototype(vm, &globalObject), None);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue JSC_HOST_CALL constructImage(ExecState* exec)
</del><ins>+template<> EncodedJSValue JSImageConstructor::construct(ExecState* state)
</ins><span class="cx"> {
</span><del>- JSImageConstructor* jsConstructor = jsCast<JSImageConstructor*>(exec->callee());
</del><ins>+ JSImageConstructor* jsConstructor = jsCast<JSImageConstructor*>(state->callee());
</ins><span class="cx"> Document* document = jsConstructor->document();
</span><span class="cx"> if (!document)
</span><del>- return throwVMError(exec, createReferenceError(exec, "Image constructor associated document is unavailable"));
</del><ins>+ return throwVMError(state, createReferenceError(state, "Image constructor associated document is unavailable"));
</ins><span class="cx">
</span><span class="cx"> // Calling toJS on the document causes the JS document wrapper to be
</span><span class="cx"> // added to the window object. This is done to ensure that JSDocument::visit
</span><span class="cx"> // will be called, which will cause the image element to be marked if necessary.
</span><del>- toJS(exec, jsConstructor->globalObject(), document);
</del><ins>+ toJS(state, jsConstructor->globalObject(), document);
</ins><span class="cx"> int width;
</span><span class="cx"> int height;
</span><span class="cx"> int* optionalWidth = 0;
</span><span class="cx"> int* optionalHeight = 0;
</span><del>- if (exec->argumentCount() > 0) {
- width = exec->argument(0).toInt32(exec);
</del><ins>+ if (state->argumentCount() > 0) {
+ width = state->argument(0).toInt32(state);
</ins><span class="cx"> optionalWidth = &width;
</span><span class="cx"> }
</span><del>- if (exec->argumentCount() > 1) {
- height = exec->argument(1).toInt32(exec);
</del><ins>+ if (state->argumentCount() > 1) {
+ height = state->argument(1).toInt32(state);
</ins><span class="cx"> optionalHeight = &height;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return JSValue::encode(asObject(toJS(exec, jsConstructor->globalObject(),
</del><ins>+ return JSValue::encode(asObject(toJS(state, jsConstructor->globalObject(),
</ins><span class="cx"> HTMLImageElement::createForJSConstructor(*document, optionalWidth, optionalHeight))));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ConstructType JSImageConstructor::getConstructData(JSCell*, ConstructData& constructData)
</del><ins>+template<> const ClassInfo JSImageConstructor::s_info = { "ImageConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSImageConstructor) };
+
+JSC::JSValue createImageConstructor(JSC::VM& vm, const JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>- constructData.native.function = constructImage;
- return ConstructTypeHost;
</del><ins>+ return getDOMConstructor<JSImageConstructor>(vm, globalObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSImageConstructorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSImageConstructor.h (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSImageConstructor.h 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/js/JSImageConstructor.h 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -20,36 +20,17 @@
</span><span class="cx"> #ifndef JSImageConstructor_h
</span><span class="cx"> #define JSImageConstructor_h
</span><span class="cx">
</span><del>-#include "DOMConstructorWithDocument.h"
-#include "JSDOMBinding.h"
-#include "JSDocument.h"
</del><ins>+namespace JSC {
+class JSValue;
+class VM;
+}
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class JSImageConstructor : public DOMConstructorWithDocument {
- public:
- typedef DOMConstructorWithDocument Base;
</del><ins>+class JSDOMGlobalObject;
</ins><span class="cx">
</span><del>- static JSImageConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSImageConstructor* constructor = new (NotNull, JSC::allocateCell<JSImageConstructor>(vm.heap)) JSImageConstructor(structure, globalObject);
- constructor->finishCreation(vm, globalObject);
- return constructor;
- }
</del><ins>+JSC::JSValue createImageConstructor(JSC::VM&, const JSDOMGlobalObject&);
</ins><span class="cx">
</span><del>- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-
- DECLARE_INFO;
-
- private:
- JSImageConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
- static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
- };
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // JSImageConstructor_h
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSReadableStreamPrivateConstructorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSReadableStreamPrivateConstructors.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSReadableStreamPrivateConstructors.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/js/JSReadableStreamPrivateConstructors.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -73,14 +73,14 @@
</span><span class="cx"> return JSReadableStreamController::create(getDOMStructure<JSReadableStreamController>(globalObject()->vm(), *globalObject()), globalObject(), ReadableStreamController::create());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> JSFunction* JSBuiltinReadableStreamReaderPrivateConstructor::createInitializeFunction(JSC::VM& vm, JSC::JSGlobalObject& globalObject)
</del><ins>+template<> FunctionExecutable* JSBuiltinReadableStreamReaderPrivateConstructor::initializeExecutable(JSC::VM& vm)
</ins><span class="cx"> {
</span><del>- return JSFunction::createBuiltinFunction(vm, readableStreamInternalsPrivateInitializeReadableStreamReaderCodeGenerator(vm), &globalObject);
</del><ins>+ return readableStreamInternalsPrivateInitializeReadableStreamReaderCodeGenerator(vm);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-template<> JSFunction* JSBuiltinReadableStreamControllerPrivateConstructor::createInitializeFunction(JSC::VM& vm, JSC::JSGlobalObject& globalObject)
</del><ins>+template<> FunctionExecutable* JSBuiltinReadableStreamControllerPrivateConstructor::initializeExecutable(JSC::VM& vm)
</ins><span class="cx"> {
</span><del>- return JSFunction::createBuiltinFunction(vm, readableStreamInternalsPrivateInitializeReadableStreamControllerCodeGenerator(vm), &globalObject);
</del><ins>+ return readableStreamInternalsPrivateInitializeReadableStreamControllerCodeGenerator(vm);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue createReadableStreamReaderPrivateConstructor(VM& vm, JSDOMGlobalObject& globalObject)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -1874,10 +1874,6 @@
</span><span class="cx">
</span><span class="cx"> # Add constructor declaration
</span><span class="cx"> if (NeedsConstructorProperty($interface)) {
</span><del>- $implIncludes{"JSDOMBinding.h"} = 1;
- if ($interface->extendedAttributes->{"NamedConstructor"}) {
- $implIncludes{"DOMConstructorWithDocument.h"} = 1;
- }
</del><span class="cx"> GenerateConstructorDeclaration(\@implContent, $className, $interface, $interfaceName);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4584,14 +4580,13 @@
</span><span class="cx"> push(@$outputArray, "};\n\n");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetParentConstructorClassName
</del><ins>+sub GetConstructorTemplateClassName
</ins><span class="cx"> {
</span><span class="cx"> my $interface = shift;
</span><del>- if ($interface->extendedAttributes->{"JSBuiltinConstructor"}) {
- return "DOMConstructorJSBuiltinObject";
- }
- return "DOMConstructorObject";
-
</del><ins>+ return "JSBuiltinConstructor" if ($interface->extendedAttributes->{"JSBuiltinConstructor"});
+ return "JSDOMConstructorNotConstructable" if ($interface->extendedAttributes->{"NamedConstructor"});
+ return "JSDOMConstructorNotConstructable" unless IsConstructable($interface);
+ return "JSDOMConstructor";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GenerateConstructorDeclaration
</span><span class="lines">@@ -4602,65 +4597,13 @@
</span><span class="cx"> my $interfaceName = shift;
</span><span class="cx">
</span><span class="cx"> my $constructorClassName = "${className}Constructor";
</span><del>- my $parentClassName = GetParentConstructorClassName($interface);
</del><ins>+ my $templateClassName = GetConstructorTemplateClassName($interface);
</ins><span class="cx">
</span><del>- push(@$outputArray, "class ${constructorClassName} : public " . $parentClassName . " {\n");
- push(@$outputArray, "private:\n");
- push(@$outputArray, " ${constructorClassName}(JSC::Structure*, JSDOMGlobalObject&);\n");
- push(@$outputArray, " void finishCreation(JSC::VM&, JSDOMGlobalObject&);\n\n");
</del><ins>+ $implIncludes{"JSDOMConstructor.h"} = 1;
</ins><span class="cx">
</span><del>- push(@$outputArray, "public:\n");
- push(@$outputArray, " typedef " . $parentClassName . " Base;\n");
- push(@$outputArray, " static $constructorClassName* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)\n");
- push(@$outputArray, " {\n");
- push(@$outputArray, " $constructorClassName* ptr = new (NotNull, JSC::allocateCell<$constructorClassName>(vm.heap)) $constructorClassName(structure, globalObject);\n");
- push(@$outputArray, " ptr->finishCreation(vm, globalObject);\n");
- push(@$outputArray, " return ptr;\n");
- push(@$outputArray, " }\n\n");
-
- push(@$outputArray, " DECLARE_INFO;\n");
-
- push(@$outputArray, " static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)\n");
- push(@$outputArray, " {\n");
- push(@$outputArray, " return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());\n");
- push(@$outputArray, " }\n");
-
- if (IsConstructable($interface) && !$interface->extendedAttributes->{"NamedConstructor"}) {
- push(@$outputArray, "protected:\n");
- push(@$outputArray, " static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);\n");
- push(@$outputArray, " static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);\n");
- }
- push(@$outputArray, "};\n\n");
-
- if ($interface->extendedAttributes->{"NamedConstructor"}) {
- push(@$outputArray, <<END);
-class JS${interfaceName}NamedConstructor : public DOMConstructorWithDocument {
-public:
- typedef DOMConstructorWithDocument Base;
-
- static JS${interfaceName}NamedConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JS${interfaceName}NamedConstructor* constructor = new (NotNull, JSC::allocateCell<JS${interfaceName}NamedConstructor>(vm.heap)) JS${interfaceName}NamedConstructor(structure, globalObject);
- constructor->finishCreation(vm, globalObject);
- return constructor;
- }
-
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-
- DECLARE_INFO;
-
-private:
- JS${interfaceName}NamedConstructor(JSC::Structure*, JSDOMGlobalObject&);
- static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);
- static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
-};
-
-END
- }
</del><ins>+ push(@$outputArray, "typedef $templateClassName<$className> ${constructorClassName};\n");
+ push(@$outputArray, "typedef JSDOMNamedConstructor<$className> JS${interfaceName}NamedConstructor;\n") if $interface->extendedAttributes->{"NamedConstructor"};
+ push(@$outputArray, "\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GenerateConstructorDefinitions
</span><span class="lines">@@ -4700,7 +4643,7 @@
</span><span class="cx"> my $lengthOfLongestOverloadedConstructorParameterList = LengthOfLongestFunctionParameterList($interface->constructors);
</span><span class="cx">
</span><span class="cx"> push(@$outputArray, <<END);
</span><del>-EncodedJSValue JSC_HOST_CALL ${className}Constructor::construct(ExecState* state)
</del><ins>+template<> EncodedJSValue JSC_HOST_CALL ${className}Constructor::construct(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> size_t argsCount = std::min<size_t>($lengthOfLongestOverloadedConstructorParameterList, state->argumentCount());
</span><span class="cx"> END
</span><span class="lines">@@ -4746,6 +4689,8 @@
</span><span class="cx"> my $generatingNamedConstructor = shift;
</span><span class="cx"> my $function = shift;
</span><span class="cx">
</span><ins>+ return if ($interface->extendedAttributes->{"JSBuiltinConstructor"});
+
</ins><span class="cx"> my $constructorClassName = $generatingNamedConstructor ? "${className}NamedConstructor" : "${className}Constructor";
</span><span class="cx">
</span><span class="cx"> if (IsConstructable($interface)) {
</span><span class="lines">@@ -4754,7 +4699,7 @@
</span><span class="cx"> $implIncludes{"<runtime/Error.h>"} = 1;
</span><span class="cx">
</span><span class="cx"> push(@$outputArray, <<END);
</span><del>-EncodedJSValue JSC_HOST_CALL ${constructorClassName}::construct(ExecState* state)
</del><ins>+template<> EncodedJSValue JSC_HOST_CALL ${constructorClassName}::construct(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> auto* jsConstructor = jsCast<${constructorClassName}*>(state->callee());
</span><span class="cx">
</span><span class="lines">@@ -4819,24 +4764,16 @@
</span><span class="cx">
</span><span class="cx"> END
</span><span class="cx"> } elsif ($interface->extendedAttributes->{"CustomConstructor"}) {
</span><del>- push(@$outputArray, "JSC::EncodedJSValue JSC_HOST_CALL ${constructorClassName}::construct(JSC::ExecState* state)\n");
</del><ins>+ push(@$outputArray, "template<> JSC::EncodedJSValue JSC_HOST_CALL ${constructorClassName}::construct(JSC::ExecState* state)\n");
</ins><span class="cx"> push(@$outputArray, "{\n");
</span><span class="cx"> push(@$outputArray, " return construct${className}(state);\n");
</span><span class="cx"> push(@$outputArray, "}\n\n");
</span><del>- } elsif ($interface->extendedAttributes->{"JSBuiltinConstructor"}) {
- push(@$outputArray, "JSC::EncodedJSValue JSC_HOST_CALL ${constructorClassName}::construct(JSC::ExecState* state)\n");
- push(@$outputArray, "{\n");
-
- push(@$outputArray, " auto* castedThis = jsCast<${constructorClassName}*>(state->callee());\n");
- push(@$outputArray, " return createJSBuiltin<${className}>(*state, *castedThis->initializeFunction(), *castedThis->globalObject());\n");
-
- push(@$outputArray, "}\n\n");
- } elsif (!HasCustomConstructor($interface) && (!$interface->extendedAttributes->{"NamedConstructor"} || $generatingNamedConstructor)) {
</del><ins>+ } elsif (!HasCustomConstructor($interface) && (!$interface->extendedAttributes->{"NamedConstructor"} || $generatingNamedConstructor)) {
</ins><span class="cx"> if ($function->{overloadedIndex} && $function->{overloadedIndex} > 0) {
</span><span class="cx"> push(@$outputArray, "static inline EncodedJSValue construct${className}$function->{overloadedIndex}(ExecState* state)\n");
</span><span class="cx"> }
</span><span class="cx"> else {
</span><del>- push(@$outputArray, "EncodedJSValue JSC_HOST_CALL ${constructorClassName}::construct(ExecState* state)\n");
</del><ins>+ push(@$outputArray, "template<> EncodedJSValue JSC_HOST_CALL ${constructorClassName}::construct(ExecState* state)\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@$outputArray, "{\n");
</span><span class="lines">@@ -4961,23 +4898,9 @@
</span><span class="cx"> $leastConstructorLength = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- push(@$outputArray, "const ClassInfo ${constructorClassName}::s_info = { \"${visibleInterfaceName}Constructor\", &Base::s_info, 0, CREATE_METHOD_TABLE($constructorClassName) };\n\n");
-
- push(@$outputArray, "${constructorClassName}::${constructorClassName}(Structure* structure, JSDOMGlobalObject& globalObject)\n");
- push(@$outputArray, " : Base(structure, globalObject)\n");
</del><ins>+ push(@$outputArray, "template<> void ${constructorClassName}::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)\n");
</ins><span class="cx"> push(@$outputArray, "{\n");
</span><del>- push(@$outputArray, "}\n\n");
</del><span class="cx">
</span><del>- push(@$outputArray, "void ${constructorClassName}::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)\n");
- push(@$outputArray, "{\n");
-
- if ($generatingNamedConstructor) {
- push(@$outputArray, " Base::finishCreation(globalObject);\n");
- } else {
- push(@$outputArray, " Base::finishCreation(vm);\n");
- }
- push(@$outputArray, " ASSERT(inherits(info()));\n");
-
</del><span class="cx"> # There must exist an interface prototype object for every non-callback interface defined, regardless
</span><span class="cx"> # of whether the interface was declared with the [NoInterfaceObject] extended attribute.
</span><span class="cx"> # https://heycam.github.io/webidl/#interface-prototype-object
</span><span class="lines">@@ -4986,7 +4909,7 @@
</span><span class="cx"> } elsif ($interface->isCallback) {
</span><span class="cx"> push(@$outputArray, " UNUSED_PARAM(globalObject);\n");
</span><span class="cx"> } else {
</span><del>- push(@$outputArray, " putDirect(vm, vm.propertyNames->prototype, ${className}::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);\n");
</del><ins>+ push(@$outputArray, " putDirect(vm, vm.propertyNames->prototype, ${className}::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> push(@$outputArray, " putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral(\"$visibleInterfaceName\"))), ReadOnly | DontEnum);\n");
</span><span class="lines">@@ -4999,35 +4922,31 @@
</span><span class="cx"> push(@$outputArray, " reifyStaticProperties(vm, ${className}ConstructorTableValues, *this);\n");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($interface->extendedAttributes->{"JSBuiltinConstructor"}) {
- my $initializeFunctionName = GetJSBuiltinFunctionName(${className}, "initialize" . ${interfaceName});
- push(@$outputArray, " setInitializeFunction(vm, *JSC::JSFunction::createBuiltinFunction(vm, ${initializeFunctionName}(vm), &globalObject));\n");
- }
-
</del><span class="cx"> push(@$outputArray, "}\n\n");
</span><span class="cx">
</span><del>- if (IsConstructable($interface)) {
- if (!$interface->extendedAttributes->{"NamedConstructor"} || $generatingNamedConstructor) {
- my $conditionalString = $codeGenerator->GenerateConstructorConditionalString($interface);
- push(@$outputArray, "ConstructType ${constructorClassName}::getConstructData(JSCell* cell, ConstructData& constructData)\n");
- push(@$outputArray, "{\n");
- if ($conditionalString) {
- push(@$outputArray, "#if $conditionalString\n");
- push(@$outputArray, " UNUSED_PARAM(cell);\n");
- push(@$outputArray, " constructData.native.function = construct;\n");
- push(@$outputArray, " return ConstructTypeHost;\n");
- push(@$outputArray, "#else\n");
- push(@$outputArray, " return Base::getConstructData(cell, constructData);\n");
- push(@$outputArray, "#endif\n");
- } else {
- push(@$outputArray, " UNUSED_PARAM(cell);\n");
- push(@$outputArray, " constructData.native.function = construct;\n");
- push(@$outputArray, " return ConstructTypeHost;\n");
- }
- push(@$outputArray, "}\n");
- push(@$outputArray, "\n");
- }
</del><ins>+ my $conditionalString = $codeGenerator->GenerateConstructorConditionalString($interface);
+ if ($conditionalString) {
+ push(@$outputArray, "template<> ConstructType ${constructorClassName}::getConstructData(JSCell*, ConstructData& constructData)\n");
+ push(@$outputArray, "{\n");
+ push(@$outputArray, "#if $conditionalString\n");
+ push(@$outputArray, " constructData.native.function = construct;\n");
+ push(@$outputArray, " return ConstructTypeHost;\n");
+ push(@$outputArray, "#else\n");
+ push(@$outputArray, " return Base::getConstructData(cell, constructData);\n");
+ push(@$outputArray, "#endif\n");
+ push(@$outputArray, "}\n");
+ push(@$outputArray, "\n");
</ins><span class="cx"> }
</span><ins>+
+ if ($interface->extendedAttributes->{"JSBuiltinConstructor"}) {
+ push(@$outputArray, "template<> FunctionExecutable* ${constructorClassName}::initializeExecutable(VM& vm)\n");
+ push(@$outputArray, "{\n");
+ push(@$outputArray, " return " . GetJSBuiltinFunctionName($className, "initialize" . $interfaceName) . "(vm);\n");
+ push(@$outputArray, "}\n");
+ push(@$outputArray, "\n");
+ }
+ push(@$outputArray, "template<> const ClassInfo ${constructorClassName}::s_info = { \"${visibleInterfaceName}Constructor\", &Base::s_info, 0, CREATE_METHOD_TABLE($constructorClassName) };\n\n");
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub HasCustomConstructor
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestActiveDOMObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestActiveDOMObject.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "JSNode.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="lines">@@ -66,27 +67,8 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestActiveDOMObjectConstructor : public DOMConstructorObject {
-private:
- JSTestActiveDOMObjectConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructorNotConstructable<JSTestActiveDOMObject> JSTestActiveDOMObjectConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestActiveDOMObjectConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestActiveDOMObjectConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestActiveDOMObjectConstructor>(vm.heap)) JSTestActiveDOMObjectConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
</del><span class="cx"> /* Hash table */
</span><span class="cx">
</span><span class="cx"> static const struct CompactHashIndex JSTestActiveDOMObjectTableIndex[4] = {
</span><span class="lines">@@ -104,22 +86,15 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static const HashTable JSTestActiveDOMObjectTable = { 2, 3, true, JSTestActiveDOMObjectTableValues, JSTestActiveDOMObjectTableIndex };
</span><del>-const ClassInfo JSTestActiveDOMObjectConstructor::s_info = { "TestActiveDOMObjectConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestActiveDOMObjectConstructor) };
-
-JSTestActiveDOMObjectConstructor::JSTestActiveDOMObjectConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestActiveDOMObjectConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestActiveDOMObjectConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestActiveDOMObject::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestActiveDOMObject"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSTestActiveDOMObjectConstructor::s_info = { "TestActiveDOMObjectConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestActiveDOMObjectConstructor) };
+
</ins><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSTestActiveDOMObjectPrototypeTableValues[] =
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCallbackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCallback.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #include "JSTestCallback.h"
</span><span class="cx">
</span><span class="cx"> #include "DOMStringList.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "JSDOMStringList.h"
</span><span class="cx"> #include "JSTestNode.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="lines">@@ -59,27 +60,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-class JSTestCallbackConstructor : public DOMConstructorObject {
-private:
- JSTestCallbackConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructorNotConstructable<JSTestCallback> JSTestCallbackConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestCallbackConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestCallbackConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestCallbackConstructor>(vm.heap)) JSTestCallbackConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
</del><span class="cx"> /* Hash table for constructor */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSTestCallbackConstructorTableValues[] =
</span><span class="lines">@@ -92,23 +74,16 @@
</span><span class="cx"> COMPILE_ASSERT(1 == TestCallback::CONSTANT1, TestCallbackEnumCONSTANT1IsWrongUseDoNotCheckConstants);
</span><span class="cx"> COMPILE_ASSERT(2 == TestCallback::CONSTANT2, TestCallbackEnumCONSTANT2IsWrongUseDoNotCheckConstants);
</span><span class="cx">
</span><del>-const ClassInfo JSTestCallbackConstructor::s_info = { "TestCallbackConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestCallbackConstructor) };
-
-JSTestCallbackConstructor::JSTestCallbackConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestCallbackConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestCallbackConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> UNUSED_PARAM(globalObject);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestCallback"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> reifyStaticProperties(vm, JSTestCallbackConstructorTableValues, *this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSTestCallbackConstructor::s_info = { "TestCallbackConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestCallbackConstructor) };
+
</ins><span class="cx"> JSValue JSTestCallback::getConstructor(VM& vm, JSGlobalObject* globalObject)
</span><span class="cx"> {
</span><span class="cx"> return getDOMConstructor<JSTestCallbackConstructor>(vm, *jsCast<JSDOMGlobalObject*>(globalObject));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCustomConstructorWithNoInterfaceObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomConstructorWithNoInterfaceObject.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "JSTestCustomConstructorWithNoInterfaceObject.h"
</span><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="lines">@@ -57,57 +58,21 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestCustomConstructorWithNoInterfaceObjectConstructor : public DOMConstructorObject {
-private:
- JSTestCustomConstructorWithNoInterfaceObjectConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructor<JSTestCustomConstructorWithNoInterfaceObject> JSTestCustomConstructorWithNoInterfaceObjectConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestCustomConstructorWithNoInterfaceObjectConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestCustomConstructorWithNoInterfaceObjectConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestCustomConstructorWithNoInterfaceObjectConstructor>(vm.heap)) JSTestCustomConstructorWithNoInterfaceObjectConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-protected:
- static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);
- static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
-};
-
-JSC::EncodedJSValue JSC_HOST_CALL JSTestCustomConstructorWithNoInterfaceObjectConstructor::construct(JSC::ExecState* state)
</del><ins>+template<> JSC::EncodedJSValue JSC_HOST_CALL JSTestCustomConstructorWithNoInterfaceObjectConstructor::construct(JSC::ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> return constructJSTestCustomConstructorWithNoInterfaceObject(state);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const ClassInfo JSTestCustomConstructorWithNoInterfaceObjectConstructor::s_info = { "TestCustomConstructorWithNoInterfaceObjectConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestCustomConstructorWithNoInterfaceObjectConstructor) };
-
-JSTestCustomConstructorWithNoInterfaceObjectConstructor::JSTestCustomConstructorWithNoInterfaceObjectConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestCustomConstructorWithNoInterfaceObjectConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestCustomConstructorWithNoInterfaceObjectConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestCustomConstructorWithNoInterfaceObject::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestCustomConstructorWithNoInterfaceObject"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ConstructType JSTestCustomConstructorWithNoInterfaceObjectConstructor::getConstructData(JSCell* cell, ConstructData& constructData)
-{
- UNUSED_PARAM(cell);
- constructData.native.function = construct;
- return ConstructTypeHost;
-}
</del><ins>+template<> const ClassInfo JSTestCustomConstructorWithNoInterfaceObjectConstructor::s_info = { "TestCustomConstructorWithNoInterfaceObjectConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestCustomConstructorWithNoInterfaceObjectConstructor) };
</ins><span class="cx">
</span><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestCustomNamedGettercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestCustomNamedGetter.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "wtf/text/AtomicString.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="lines">@@ -64,27 +65,8 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestCustomNamedGetterConstructor : public DOMConstructorObject {
-private:
- JSTestCustomNamedGetterConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructorNotConstructable<JSTestCustomNamedGetter> JSTestCustomNamedGetterConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestCustomNamedGetterConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestCustomNamedGetterConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestCustomNamedGetterConstructor>(vm.heap)) JSTestCustomNamedGetterConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
</del><span class="cx"> /* Hash table */
</span><span class="cx">
</span><span class="cx"> static const struct CompactHashIndex JSTestCustomNamedGetterTableIndex[2] = {
</span><span class="lines">@@ -99,22 +81,15 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static const HashTable JSTestCustomNamedGetterTable = { 1, 1, true, JSTestCustomNamedGetterTableValues, JSTestCustomNamedGetterTableIndex };
</span><del>-const ClassInfo JSTestCustomNamedGetterConstructor::s_info = { "TestCustomNamedGetterConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestCustomNamedGetterConstructor) };
-
-JSTestCustomNamedGetterConstructor::JSTestCustomNamedGetterConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestCustomNamedGetterConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestCustomNamedGetterConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestCustomNamedGetter::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestCustomNamedGetter"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSTestCustomNamedGetterConstructor::s_info = { "TestCustomNamedGetterConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestCustomNamedGetterConstructor) };
+
</ins><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSTestCustomNamedGetterPrototypeTableValues[] =
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestEventConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventConstructor.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "JSTestEventConstructor.h"
</span><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "JSDictionary.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="lines">@@ -63,31 +64,9 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestEventConstructorConstructor : public DOMConstructorObject {
-private:
- JSTestEventConstructorConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructor<JSTestEventConstructor> JSTestEventConstructorConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestEventConstructorConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestEventConstructorConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestEventConstructorConstructor>(vm.heap)) JSTestEventConstructorConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-protected:
- static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);
- static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
-};
-
-EncodedJSValue JSC_HOST_CALL JSTestEventConstructorConstructor::construct(ExecState* state)
</del><ins>+template<> EncodedJSValue JSC_HOST_CALL JSTestEventConstructorConstructor::construct(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> auto* jsConstructor = jsCast<JSTestEventConstructorConstructor*>(state->callee());
</span><span class="cx">
</span><span class="lines">@@ -128,28 +107,14 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const ClassInfo JSTestEventConstructorConstructor::s_info = { "TestEventConstructorConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestEventConstructorConstructor) };
-
-JSTestEventConstructorConstructor::JSTestEventConstructorConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestEventConstructorConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestEventConstructorConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestEventConstructor::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestEventConstructor"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(1), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ConstructType JSTestEventConstructorConstructor::getConstructData(JSCell* cell, ConstructData& constructData)
-{
- UNUSED_PARAM(cell);
- constructData.native.function = construct;
- return ConstructTypeHost;
-}
</del><ins>+template<> const ClassInfo JSTestEventConstructorConstructor::s_info = { "TestEventConstructorConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestEventConstructorConstructor) };
</ins><span class="cx">
</span><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestEventTargetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestEventTarget.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "JSEvent.h"
</span><span class="cx"> #include "JSEventListener.h"
</span><span class="cx"> #include "JSNode.h"
</span><span class="lines">@@ -73,27 +74,8 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestEventTargetConstructor : public DOMConstructorObject {
-private:
- JSTestEventTargetConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructorNotConstructable<JSTestEventTarget> JSTestEventTargetConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestEventTargetConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestEventTargetConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestEventTargetConstructor>(vm.heap)) JSTestEventTargetConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
</del><span class="cx"> /* Hash table */
</span><span class="cx">
</span><span class="cx"> static const struct CompactHashIndex JSTestEventTargetTableIndex[2] = {
</span><span class="lines">@@ -108,22 +90,15 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static const HashTable JSTestEventTargetTable = { 1, 1, true, JSTestEventTargetTableValues, JSTestEventTargetTableIndex };
</span><del>-const ClassInfo JSTestEventTargetConstructor::s_info = { "TestEventTargetConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestEventTargetConstructor) };
-
-JSTestEventTargetConstructor::JSTestEventTargetConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestEventTargetConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestEventTargetConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestEventTarget::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestEventTarget"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSTestEventTargetConstructor::s_info = { "TestEventTargetConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestEventTargetConstructor) };
+
</ins><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSTestEventTargetPrototypeTableValues[] =
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestExceptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestException.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "JSTestException.h"
</span><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <runtime/JSString.h>
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="lines">@@ -60,27 +61,8 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestExceptionConstructor : public DOMConstructorObject {
-private:
- JSTestExceptionConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructorNotConstructable<JSTestException> JSTestExceptionConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestExceptionConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestExceptionConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestExceptionConstructor>(vm.heap)) JSTestExceptionConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
</del><span class="cx"> /* Hash table */
</span><span class="cx">
</span><span class="cx"> static const struct CompactHashIndex JSTestExceptionTableIndex[2] = {
</span><span class="lines">@@ -95,22 +77,15 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static const HashTable JSTestExceptionTable = { 1, 1, true, JSTestExceptionTableValues, JSTestExceptionTableIndex };
</span><del>-const ClassInfo JSTestExceptionConstructor::s_info = { "TestExceptionConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestExceptionConstructor) };
-
-JSTestExceptionConstructor::JSTestExceptionConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestExceptionConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestExceptionConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestException::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestException"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSTestExceptionConstructor::s_info = { "TestExceptionConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestExceptionConstructor) };
+
</ins><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSTestExceptionPrototypeTableValues[] =
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestGenerateIsReachablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestGenerateIsReachable.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "JSTestGenerateIsReachable.h"
</span><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="lines">@@ -57,43 +58,17 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestGenerateIsReachableConstructor : public DOMConstructorObject {
-private:
- JSTestGenerateIsReachableConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructorNotConstructable<JSTestGenerateIsReachable> JSTestGenerateIsReachableConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestGenerateIsReachableConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestGenerateIsReachableConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestGenerateIsReachableConstructor>(vm.heap)) JSTestGenerateIsReachableConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
-const ClassInfo JSTestGenerateIsReachableConstructor::s_info = { "TestGenerateIsReachableConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestGenerateIsReachableConstructor) };
-
-JSTestGenerateIsReachableConstructor::JSTestGenerateIsReachableConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestGenerateIsReachableConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestGenerateIsReachableConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestGenerateIsReachable::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestGenerateIsReachable"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSTestGenerateIsReachableConstructor::s_info = { "TestGenerateIsReachableConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestGenerateIsReachableConstructor) };
+
</ins><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSTestGenerateIsReachablePrototypeTableValues[] =
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestInterface.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "TestObj.h"
</span><span class="cx"> #include "TestSupplemental.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="lines">@@ -143,30 +144,8 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestInterfaceConstructor : public DOMConstructorObject {
-private:
- JSTestInterfaceConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructor<JSTestInterface> JSTestInterfaceConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestInterfaceConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestInterfaceConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestInterfaceConstructor>(vm.heap)) JSTestInterfaceConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-protected:
- static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);
- static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
-};
-
</del><span class="cx"> /* Hash table */
</span><span class="cx">
</span><span class="cx"> static const struct CompactHashIndex JSTestInterfaceTableIndex[4] = {
</span><span class="lines">@@ -262,7 +241,7 @@
</span><span class="cx"> COMPILE_ASSERT(2 == TestSupplemental::CONST_IMPL, TestInterfaceEnumCONST_IMPLIsWrongUseDoNotCheckConstants);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL JSTestInterfaceConstructor::construct(ExecState* state)
</del><ins>+template<> EncodedJSValue JSC_HOST_CALL JSTestInterfaceConstructor::construct(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> auto* castedThis = jsCast<JSTestInterfaceConstructor*>(state->callee());
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="lines">@@ -285,27 +264,17 @@
</span><span class="cx"> return JSValue::encode(asObject(toJS(state, castedThis->globalObject(), object.get())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const ClassInfo JSTestInterfaceConstructor::s_info = { "TestInterfaceConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestInterfaceConstructor) };
-
-JSTestInterfaceConstructor::JSTestInterfaceConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestInterfaceConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestInterfaceConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestInterface::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestInterface"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(1), ReadOnly | DontEnum);
</span><span class="cx"> reifyStaticProperties(vm, JSTestInterfaceConstructorTableValues, *this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ConstructType JSTestInterfaceConstructor::getConstructData(JSCell* cell, ConstructData& constructData)
</del><ins>+template<> ConstructType JSTestInterfaceConstructor::getConstructData(JSCell*, ConstructData& constructData)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(TEST_INTERFACE)
</span><del>- UNUSED_PARAM(cell);
</del><span class="cx"> constructData.native.function = construct;
</span><span class="cx"> return ConstructTypeHost;
</span><span class="cx"> #else
</span><span class="lines">@@ -313,6 +282,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSTestInterfaceConstructor::s_info = { "TestInterfaceConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestInterfaceConstructor) };
+
</ins><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSTestInterfacePrototypeTableValues[] =
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestJSBuiltinConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestJSBuiltinConstructor.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "JSTestJSBuiltinConstructor.h"
</span><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "TestJSBuiltinConstructorBuiltins.h"
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -58,60 +59,22 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestJSBuiltinConstructorConstructor : public DOMConstructorJSBuiltinObject {
-private:
- JSTestJSBuiltinConstructorConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSBuiltinConstructor<JSTestJSBuiltinConstructor> JSTestJSBuiltinConstructorConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorJSBuiltinObject Base;
- static JSTestJSBuiltinConstructorConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestJSBuiltinConstructorConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestJSBuiltinConstructorConstructor>(vm.heap)) JSTestJSBuiltinConstructorConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-protected:
- static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);
- static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
-};
-
-JSC::EncodedJSValue JSC_HOST_CALL JSTestJSBuiltinConstructorConstructor::construct(JSC::ExecState* state)
</del><ins>+template<> void JSTestJSBuiltinConstructorConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>- auto* castedThis = jsCast<JSTestJSBuiltinConstructorConstructor*>(state->callee());
- return createJSBuiltin<JSTestJSBuiltinConstructor>(*state, *castedThis->initializeFunction(), *castedThis->globalObject());
-}
-
-const ClassInfo JSTestJSBuiltinConstructorConstructor::s_info = { "TestJSBuiltinConstructorConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestJSBuiltinConstructorConstructor) };
-
-JSTestJSBuiltinConstructorConstructor::JSTestJSBuiltinConstructorConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
-{
-}
-
-void JSTestJSBuiltinConstructorConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestJSBuiltinConstructor::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestJSBuiltinConstructor"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><del>- setInitializeFunction(vm, *JSC::JSFunction::createBuiltinFunction(vm, testJSBuiltinConstructorInitializeTestJSBuiltinConstructorCodeGenerator(vm), &globalObject));
</del><span class="cx"> }
</span><span class="cx">
</span><del>-ConstructType JSTestJSBuiltinConstructorConstructor::getConstructData(JSCell* cell, ConstructData& constructData)
</del><ins>+template<> FunctionExecutable* JSTestJSBuiltinConstructorConstructor::initializeExecutable(VM& vm)
</ins><span class="cx"> {
</span><del>- UNUSED_PARAM(cell);
- constructData.native.function = construct;
- return ConstructTypeHost;
</del><ins>+ return testJSBuiltinConstructorInitializeTestJSBuiltinConstructorCodeGenerator(vm);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSTestJSBuiltinConstructorConstructor::s_info = { "TestJSBuiltinConstructorConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestJSBuiltinConstructorConstructor) };
+
</ins><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSTestJSBuiltinConstructorPrototypeTableValues[] =
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestMediaQueryListListenercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestMediaQueryListListener.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "JSMediaQueryListListener.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="lines">@@ -64,43 +65,17 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestMediaQueryListListenerConstructor : public DOMConstructorObject {
-private:
- JSTestMediaQueryListListenerConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructorNotConstructable<JSTestMediaQueryListListener> JSTestMediaQueryListListenerConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestMediaQueryListListenerConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestMediaQueryListListenerConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestMediaQueryListListenerConstructor>(vm.heap)) JSTestMediaQueryListListenerConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
-const ClassInfo JSTestMediaQueryListListenerConstructor::s_info = { "TestMediaQueryListListenerConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestMediaQueryListListenerConstructor) };
-
-JSTestMediaQueryListListenerConstructor::JSTestMediaQueryListListenerConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestMediaQueryListListenerConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestMediaQueryListListenerConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestMediaQueryListListener::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestMediaQueryListListener"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSTestMediaQueryListListenerConstructor::s_info = { "TestMediaQueryListListenerConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestMediaQueryListListenerConstructor) };
+
</ins><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSTestMediaQueryListListenerPrototypeTableValues[] =
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNamedConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNamedConstructor.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -21,9 +21,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSTestNamedConstructor.h"
</span><span class="cx">
</span><del>-#include "DOMConstructorWithDocument.h"
</del><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -60,69 +60,19 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestNamedConstructorConstructor : public DOMConstructorObject {
-private:
- JSTestNamedConstructorConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructorNotConstructable<JSTestNamedConstructor> JSTestNamedConstructorConstructor;
+typedef JSDOMNamedConstructor<JSTestNamedConstructor> JSTestNamedConstructorNamedConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestNamedConstructorConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestNamedConstructorConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestNamedConstructorConstructor>(vm.heap)) JSTestNamedConstructorConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
-class JSTestNamedConstructorNamedConstructor : public DOMConstructorWithDocument {
-public:
- typedef DOMConstructorWithDocument Base;
-
- static JSTestNamedConstructorNamedConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestNamedConstructorNamedConstructor* constructor = new (NotNull, JSC::allocateCell<JSTestNamedConstructorNamedConstructor>(vm.heap)) JSTestNamedConstructorNamedConstructor(structure, globalObject);
- constructor->finishCreation(vm, globalObject);
- return constructor;
- }
-
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-
- DECLARE_INFO;
-
-private:
- JSTestNamedConstructorNamedConstructor(JSC::Structure*, JSDOMGlobalObject&);
- static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);
- static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
-};
-
-const ClassInfo JSTestNamedConstructorConstructor::s_info = { "TestNamedConstructorConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestNamedConstructorConstructor) };
-
-JSTestNamedConstructorConstructor::JSTestNamedConstructorConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestNamedConstructorConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestNamedConstructorConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestNamedConstructor::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestNamedConstructor"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL JSTestNamedConstructorNamedConstructor::construct(ExecState* state)
</del><ins>+template<> const ClassInfo JSTestNamedConstructorConstructor::s_info = { "TestNamedConstructorConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestNamedConstructorConstructor) };
+
+template<> EncodedJSValue JSC_HOST_CALL JSTestNamedConstructorNamedConstructor::construct(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> auto* castedThis = jsCast<JSTestNamedConstructorNamedConstructor*>(state->callee());
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 1))
</span><span class="lines">@@ -145,28 +95,14 @@
</span><span class="cx"> return JSValue::encode(asObject(toJS(state, castedThis->globalObject(), object.get())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const ClassInfo JSTestNamedConstructorNamedConstructor::s_info = { "AudioConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestNamedConstructorNamedConstructor) };
-
-JSTestNamedConstructorNamedConstructor::JSTestNamedConstructorNamedConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestNamedConstructorNamedConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestNamedConstructorNamedConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(globalObject);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestNamedConstructor::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("Audio"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ConstructType JSTestNamedConstructorNamedConstructor::getConstructData(JSCell* cell, ConstructData& constructData)
-{
- UNUSED_PARAM(cell);
- constructData.native.function = construct;
- return ConstructTypeHost;
-}
</del><ins>+template<> const ClassInfo JSTestNamedConstructorNamedConstructor::s_info = { "AudioConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestNamedConstructorNamedConstructor) };
</ins><span class="cx">
</span><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNode.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <runtime/JSString.h>
</span><span class="lines">@@ -63,59 +64,23 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestNodeConstructor : public DOMConstructorObject {
-private:
- JSTestNodeConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructor<JSTestNode> JSTestNodeConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestNodeConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestNodeConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestNodeConstructor>(vm.heap)) JSTestNodeConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-protected:
- static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);
- static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
-};
-
-EncodedJSValue JSC_HOST_CALL JSTestNodeConstructor::construct(ExecState* state)
</del><ins>+template<> EncodedJSValue JSC_HOST_CALL JSTestNodeConstructor::construct(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> auto* castedThis = jsCast<JSTestNodeConstructor*>(state->callee());
</span><span class="cx"> RefPtr<TestNode> object = TestNode::create();
</span><span class="cx"> return JSValue::encode(asObject(toJS(state, castedThis->globalObject(), object.get())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const ClassInfo JSTestNodeConstructor::s_info = { "TestNodeConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestNodeConstructor) };
-
-JSTestNodeConstructor::JSTestNodeConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestNodeConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestNodeConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestNode::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestNode"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ConstructType JSTestNodeConstructor::getConstructData(JSCell* cell, ConstructData& constructData)
-{
- UNUSED_PARAM(cell);
- constructData.native.function = construct;
- return ConstructTypeHost;
-}
</del><ins>+template<> const ClassInfo JSTestNodeConstructor::s_info = { "TestNodeConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestNodeConstructor) };
</ins><span class="cx">
</span><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestNondeterministiccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestNondeterministic.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <runtime/JSString.h>
</span><span class="lines">@@ -80,43 +81,17 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestNondeterministicConstructor : public DOMConstructorObject {
-private:
- JSTestNondeterministicConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructorNotConstructable<JSTestNondeterministic> JSTestNondeterministicConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestNondeterministicConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestNondeterministicConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestNondeterministicConstructor>(vm.heap)) JSTestNondeterministicConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
-const ClassInfo JSTestNondeterministicConstructor::s_info = { "TestNondeterministicConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestNondeterministicConstructor) };
-
-JSTestNondeterministicConstructor::JSTestNondeterministicConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestNondeterministicConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestNondeterministicConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestNondeterministic::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestNondeterministic"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSTestNondeterministicConstructor::s_info = { "TestNondeterministicConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestNondeterministicConstructor) };
+
</ins><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSTestNondeterministicPrototypeTableValues[] =
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestObjcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "JSDOMPromise.h"
</span><span class="cx"> #include "JSDOMStringList.h"
</span><span class="cx"> #include "JSDocument.h"
</span><span class="lines">@@ -345,30 +346,8 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestObjConstructor : public DOMConstructorObject {
-private:
- JSTestObjConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructor<JSTestObj> JSTestObjConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestObjConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestObjConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestObjConstructor>(vm.heap)) JSTestObjConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-protected:
- static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);
- static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
-};
-
</del><span class="cx"> /* Hash table */
</span><span class="cx">
</span><span class="cx"> static const struct CompactHashIndex JSTestObjTableIndex[17] = {
</span><span class="lines">@@ -468,7 +447,7 @@
</span><span class="cx"> COMPILE_ASSERT(15 == TestObj::CONST_IMPL, TestObjEnumCONST_IMPLIsWrongUseDoNotCheckConstants);
</span><span class="cx"> COMPILE_ASSERT(0 == TestObj::readonly, TestObjEnumreadonlyIsWrongUseDoNotCheckConstants);
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL JSTestObjConstructor::construct(ExecState* state)
</del><ins>+template<> EncodedJSValue JSC_HOST_CALL JSTestObjConstructor::construct(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> auto* castedThis = jsCast<JSTestObjConstructor*>(state->callee());
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="lines">@@ -483,29 +462,15 @@
</span><span class="cx"> return JSValue::encode(asObject(toJS(state, castedThis->globalObject(), object.get())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const ClassInfo JSTestObjConstructor::s_info = { "TestObjectConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestObjConstructor) };
-
-JSTestObjConstructor::JSTestObjConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestObjConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestObjConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestObj::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestObject"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(2), ReadOnly | DontEnum);
</span><span class="cx"> reifyStaticProperties(vm, JSTestObjConstructorTableValues, *this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ConstructType JSTestObjConstructor::getConstructData(JSCell* cell, ConstructData& constructData)
-{
- UNUSED_PARAM(cell);
- constructData.native.function = construct;
- return ConstructTypeHost;
-}
</del><ins>+template<> const ClassInfo JSTestObjConstructor::s_info = { "TestObjectConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestObjConstructor) };
</ins><span class="cx">
</span><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverloadedConstructorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverloadedConstructors.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSBlob.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include <runtime/Error.h>
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -60,30 +61,8 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestOverloadedConstructorsConstructor : public DOMConstructorObject {
-private:
- JSTestOverloadedConstructorsConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructor<JSTestOverloadedConstructors> JSTestOverloadedConstructorsConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestOverloadedConstructorsConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestOverloadedConstructorsConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestOverloadedConstructorsConstructor>(vm.heap)) JSTestOverloadedConstructorsConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-protected:
- static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);
- static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
-};
-
</del><span class="cx"> static inline EncodedJSValue constructJSTestOverloadedConstructors1(ExecState* state)
</span><span class="cx"> {
</span><span class="cx"> auto* castedThis = jsCast<JSTestOverloadedConstructorsConstructor*>(state->callee());
</span><span class="lines">@@ -142,7 +121,7 @@
</span><span class="cx"> return JSValue::encode(asObject(toJS(state, castedThis->globalObject(), object.get())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL JSTestOverloadedConstructorsConstructor::construct(ExecState* state)
</del><ins>+template<> EncodedJSValue JSC_HOST_CALL JSTestOverloadedConstructorsConstructor::construct(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> size_t argsCount = std::min<size_t>(1, state->argumentCount());
</span><span class="cx"> JSValue arg0(state->argument(0));
</span><span class="lines">@@ -161,28 +140,14 @@
</span><span class="cx"> return throwVMTypeError(state);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const ClassInfo JSTestOverloadedConstructorsConstructor::s_info = { "TestOverloadedConstructorsConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestOverloadedConstructorsConstructor) };
-
-JSTestOverloadedConstructorsConstructor::JSTestOverloadedConstructorsConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestOverloadedConstructorsConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestOverloadedConstructorsConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestOverloadedConstructors::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestOverloadedConstructors"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ConstructType JSTestOverloadedConstructorsConstructor::getConstructData(JSCell* cell, ConstructData& constructData)
-{
- UNUSED_PARAM(cell);
- constructData.native.function = construct;
- return ConstructTypeHost;
-}
</del><ins>+template<> const ClassInfo JSTestOverloadedConstructorsConstructor::s_info = { "TestOverloadedConstructorsConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestOverloadedConstructorsConstructor) };
</ins><span class="cx">
</span><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestOverrideBuiltinscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestOverrideBuiltins.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "JSNode.h"
</span><span class="cx"> #include "Node.h"
</span><span class="cx"> #include "wtf/text/AtomicString.h"
</span><span class="lines">@@ -66,27 +67,8 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestOverrideBuiltinsConstructor : public DOMConstructorObject {
-private:
- JSTestOverrideBuiltinsConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructorNotConstructable<JSTestOverrideBuiltins> JSTestOverrideBuiltinsConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestOverrideBuiltinsConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestOverrideBuiltinsConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestOverrideBuiltinsConstructor>(vm.heap)) JSTestOverrideBuiltinsConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
</del><span class="cx"> /* Hash table */
</span><span class="cx">
</span><span class="cx"> static const struct CompactHashIndex JSTestOverrideBuiltinsTableIndex[2] = {
</span><span class="lines">@@ -101,22 +83,15 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static const HashTable JSTestOverrideBuiltinsTable = { 1, 1, true, JSTestOverrideBuiltinsTableValues, JSTestOverrideBuiltinsTableIndex };
</span><del>-const ClassInfo JSTestOverrideBuiltinsConstructor::s_info = { "TestOverrideBuiltinsConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestOverrideBuiltinsConstructor) };
-
-JSTestOverrideBuiltinsConstructor::JSTestOverrideBuiltinsConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestOverrideBuiltinsConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestOverrideBuiltinsConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestOverrideBuiltins::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestOverrideBuiltins"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSTestOverrideBuiltinsConstructor::s_info = { "TestOverrideBuiltinsConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestOverrideBuiltinsConstructor) };
+
</ins><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSTestOverrideBuiltinsPrototypeTableValues[] =
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestSerializedScriptValueInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestSerializedScriptValueInterface.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> #include "JSTestSerializedScriptValueInterface.h"
</span><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "JSMessagePort.h"
</span><span class="cx"> #include "MessagePort.h"
</span><span class="cx"> #include "SerializedScriptValue.h"
</span><span class="lines">@@ -71,43 +72,17 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestSerializedScriptValueInterfaceConstructor : public DOMConstructorObject {
-private:
- JSTestSerializedScriptValueInterfaceConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructorNotConstructable<JSTestSerializedScriptValueInterface> JSTestSerializedScriptValueInterfaceConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestSerializedScriptValueInterfaceConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestSerializedScriptValueInterfaceConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestSerializedScriptValueInterfaceConstructor>(vm.heap)) JSTestSerializedScriptValueInterfaceConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
-const ClassInfo JSTestSerializedScriptValueInterfaceConstructor::s_info = { "TestSerializedScriptValueInterfaceConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestSerializedScriptValueInterfaceConstructor) };
-
-JSTestSerializedScriptValueInterfaceConstructor::JSTestSerializedScriptValueInterfaceConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestSerializedScriptValueInterfaceConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestSerializedScriptValueInterfaceConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestSerializedScriptValueInterface::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestSerializedScriptValueInterface"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSTestSerializedScriptValueInterfaceConstructor::s_info = { "TestSerializedScriptValueInterfaceConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestSerializedScriptValueInterfaceConstructor) };
+
</ins><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSTestSerializedScriptValueInterfacePrototypeTableValues[] =
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSTestTypedefscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSTestTypedefs.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include "DOMStringList.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "JSDOMStringList.h"
</span><span class="cx"> #include "JSSVGPoint.h"
</span><span class="cx"> #include "JSSerializedScriptValue.h"
</span><span class="lines">@@ -97,30 +98,8 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSTestTypedefsConstructor : public DOMConstructorObject {
-private:
- JSTestTypedefsConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructor<JSTestTypedefs> JSTestTypedefsConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSTestTypedefsConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSTestTypedefsConstructor* ptr = new (NotNull, JSC::allocateCell<JSTestTypedefsConstructor>(vm.heap)) JSTestTypedefsConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-protected:
- static JSC::EncodedJSValue JSC_HOST_CALL construct(JSC::ExecState*);
- static JSC::ConstructType getConstructData(JSC::JSCell*, JSC::ConstructData&);
-};
-
</del><span class="cx"> /* Hash table */
</span><span class="cx">
</span><span class="cx"> static const struct CompactHashIndex JSTestTypedefsTableIndex[2] = {
</span><span class="lines">@@ -142,7 +121,7 @@
</span><span class="cx"> { "TestSubObj", DontDelete | ReadOnly, NoIntrinsic, { (intptr_t)static_cast<PropertySlot::GetValueFunc>(jsTestTypedefsConstructorTestSubObj), (intptr_t) static_cast<PutPropertySlot::PutValueFunc>(0) } },
</span><span class="cx"> };
</span><span class="cx">
</span><del>-EncodedJSValue JSC_HOST_CALL JSTestTypedefsConstructor::construct(ExecState* state)
</del><ins>+template<> EncodedJSValue JSC_HOST_CALL JSTestTypedefsConstructor::construct(ExecState* state)
</ins><span class="cx"> {
</span><span class="cx"> auto* castedThis = jsCast<JSTestTypedefsConstructor*>(state->callee());
</span><span class="cx"> if (UNLIKELY(state->argumentCount() < 2))
</span><span class="lines">@@ -157,29 +136,15 @@
</span><span class="cx"> return JSValue::encode(asObject(toJS(state, castedThis->globalObject(), object.get())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-const ClassInfo JSTestTypedefsConstructor::s_info = { "TestTypedefsConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestTypedefsConstructor) };
-
-JSTestTypedefsConstructor::JSTestTypedefsConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSTestTypedefsConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSTestTypedefsConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSTestTypedefs::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("TestTypedefs"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(2), ReadOnly | DontEnum);
</span><span class="cx"> reifyStaticProperties(vm, JSTestTypedefsConstructorTableValues, *this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ConstructType JSTestTypedefsConstructor::getConstructData(JSCell* cell, ConstructData& constructData)
-{
- UNUSED_PARAM(cell);
- constructData.native.function = construct;
- return ConstructTypeHost;
-}
</del><ins>+template<> const ClassInfo JSTestTypedefsConstructor::s_info = { "TestTypedefsConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSTestTypedefsConstructor) };
</ins><span class="cx">
</span><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSattributecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSattribute.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "JSattribute.h"
</span><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <runtime/JSString.h>
</span><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="lines">@@ -60,43 +61,17 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSattributeConstructor : public DOMConstructorObject {
-private:
- JSattributeConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructorNotConstructable<JSattribute> JSattributeConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSattributeConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSattributeConstructor* ptr = new (NotNull, JSC::allocateCell<JSattributeConstructor>(vm.heap)) JSattributeConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
-const ClassInfo JSattributeConstructor::s_info = { "attributeConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSattributeConstructor) };
-
-JSattributeConstructor::JSattributeConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSattributeConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSattributeConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSattribute::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("attribute"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSattributeConstructor::s_info = { "attributeConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSattributeConstructor) };
+
</ins><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSattributePrototypeTableValues[] =
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestJSJSreadonlycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp (191175 => 191176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp 2015-10-16 14:43:02 UTC (rev 191175)
+++ trunk/Source/WebCore/bindings/scripts/test/JS/JSreadonly.cpp 2015-10-16 15:56:12 UTC (rev 191176)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "JSreadonly.h"
</span><span class="cx">
</span><span class="cx"> #include "JSDOMBinding.h"
</span><ins>+#include "JSDOMConstructor.h"
</ins><span class="cx"> #include <wtf/GetPtr.h>
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="lines">@@ -57,43 +58,17 @@
</span><span class="cx"> void finishCreation(JSC::VM&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class JSreadonlyConstructor : public DOMConstructorObject {
-private:
- JSreadonlyConstructor(JSC::Structure*, JSDOMGlobalObject&);
- void finishCreation(JSC::VM&, JSDOMGlobalObject&);
</del><ins>+typedef JSDOMConstructorNotConstructable<JSreadonly> JSreadonlyConstructor;
</ins><span class="cx">
</span><del>-public:
- typedef DOMConstructorObject Base;
- static JSreadonlyConstructor* create(JSC::VM& vm, JSC::Structure* structure, JSDOMGlobalObject& globalObject)
- {
- JSreadonlyConstructor* ptr = new (NotNull, JSC::allocateCell<JSreadonlyConstructor>(vm.heap)) JSreadonlyConstructor(structure, globalObject);
- ptr->finishCreation(vm, globalObject);
- return ptr;
- }
-
- DECLARE_INFO;
- static JSC::Structure* createStructure(JSC::VM& vm, JSC::JSGlobalObject& globalObject, JSC::JSValue prototype)
- {
- return JSC::Structure::create(vm, &globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());
- }
-};
-
-const ClassInfo JSreadonlyConstructor::s_info = { "readonlyConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSreadonlyConstructor) };
-
-JSreadonlyConstructor::JSreadonlyConstructor(Structure* structure, JSDOMGlobalObject& globalObject)
- : Base(structure, globalObject)
</del><ins>+template<> void JSreadonlyConstructor::initializeProperties(VM& vm, JSDOMGlobalObject& globalObject)
</ins><span class="cx"> {
</span><del>-}
-
-void JSreadonlyConstructor::finishCreation(VM& vm, JSDOMGlobalObject& globalObject)
-{
- Base::finishCreation(vm);
- ASSERT(inherits(info()));
</del><span class="cx"> putDirect(vm, vm.propertyNames->prototype, JSreadonly::getPrototype(vm, &globalObject), DontDelete | ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->name, jsNontrivialString(&vm, String(ASCIILiteral("readonly"))), ReadOnly | DontEnum);
</span><span class="cx"> putDirect(vm, vm.propertyNames->length, jsNumber(0), ReadOnly | DontEnum);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template<> const ClassInfo JSreadonlyConstructor::s_info = { "readonlyConstructor", &Base::s_info, 0, CREATE_METHOD_TABLE(JSreadonlyConstructor) };
+
</ins><span class="cx"> /* Hash table for prototype */
</span><span class="cx">
</span><span class="cx"> static const HashTableValue JSreadonlyPrototypeTableValues[] =
</span></span></pre>
</div>
</div>
</body>
</html>