<!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>[197612] 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/197612">197612</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-05 00:31:38 -0800 (Sat, 05 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move QualifiedName from CustomElementInfo to JSCustomElementInterface
https://bugs.webkit.org/show_bug.cgi?id=155061
Reviewed by Antti Koivisto.
Store QualifiedName of custom elements in JSCustomElementInterface instead of CustomElementInfo
now that each interface is associated with exactly one custom element as of <a href="http://trac.webkit.org/projects/webkit/changeset/197602">r197602</a>.
No new tests since this is a refactoring.
* bindings/js/JSCustomElementInterface.cpp:
(WebCore::JSCustomElementInterface::JSCustomElementInterface): Now takes QualifiedName as the
first argument.
* bindings/js/JSCustomElementInterface.h:
(WebCore::JSCustomElementInterface::create):
(WebCore::JSCustomElementInterface::name): Added.
* bindings/js/JSDocumentCustom.cpp:
(WebCore::JSDocument::defineElement):
* bindings/js/JSHTMLElementCustom.cpp:
(WebCore::constructJSHTMLElement): Use findInterface instead of the deleted findName.
* dom/CustomElementDefinitions.cpp:
(WebCore::CustomElementDefinitions::checkName):
(WebCore::CustomElementDefinitions::addElementDefinition): Renamed from defineElement.
(WebCore::CustomElementDefinitions::findInterface): Add a variant that finds the interface object
by a JS constructor.
(WebCore::CustomElementDefinitions::containsConstructor):
(WebCore::CustomElementDefinitions::findName): Deleted.
* dom/CustomElementDefinitions.h:
(WebCore::CustomElementDefinitions::CustomElementInfo::CustomElementInfo): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCustomElementInterfacecpp">trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCustomElementInterfaceh">trunk/Source/WebCore/bindings/js/JSCustomElementInterface.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDocumentCustomcpp">trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSHTMLElementCustomcpp">trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCustomElementDefinitionscpp">trunk/Source/WebCore/dom/CustomElementDefinitions.cpp</a></li>
<li><a href="#trunkSourceWebCoredomCustomElementDefinitionsh">trunk/Source/WebCore/dom/CustomElementDefinitions.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (197611 => 197612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-05 07:50:54 UTC (rev 197611)
+++ trunk/Source/WebCore/ChangeLog 2016-03-05 08:31:38 UTC (rev 197612)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-03-05 Ryosuke Niwa <rniwa@webkit.org>
+
+ Move QualifiedName from CustomElementInfo to JSCustomElementInterface
+ https://bugs.webkit.org/show_bug.cgi?id=155061
+
+ Reviewed by Antti Koivisto.
+
+ Store QualifiedName of custom elements in JSCustomElementInterface instead of CustomElementInfo
+ now that each interface is associated with exactly one custom element as of r197602.
+
+ No new tests since this is a refactoring.
+
+ * bindings/js/JSCustomElementInterface.cpp:
+ (WebCore::JSCustomElementInterface::JSCustomElementInterface): Now takes QualifiedName as the
+ first argument.
+ * bindings/js/JSCustomElementInterface.h:
+ (WebCore::JSCustomElementInterface::create):
+ (WebCore::JSCustomElementInterface::name): Added.
+ * bindings/js/JSDocumentCustom.cpp:
+ (WebCore::JSDocument::defineElement):
+ * bindings/js/JSHTMLElementCustom.cpp:
+ (WebCore::constructJSHTMLElement): Use findInterface instead of the deleted findName.
+ * dom/CustomElementDefinitions.cpp:
+ (WebCore::CustomElementDefinitions::checkName):
+ (WebCore::CustomElementDefinitions::addElementDefinition): Renamed from defineElement.
+ (WebCore::CustomElementDefinitions::findInterface): Add a variant that finds the interface object
+ by a JS constructor.
+ (WebCore::CustomElementDefinitions::containsConstructor):
+ (WebCore::CustomElementDefinitions::findName): Deleted.
+ * dom/CustomElementDefinitions.h:
+ (WebCore::CustomElementDefinitions::CustomElementInfo::CustomElementInfo): Deleted.
+
</ins><span class="cx"> 2016-03-04 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add basic support for attributeChanged lifecycle callback
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCustomElementInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp (197611 => 197612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp 2016-03-05 07:50:54 UTC (rev 197611)
+++ trunk/Source/WebCore/bindings/js/JSCustomElementInterface.cpp 2016-03-05 08:31:38 UTC (rev 197612)
</span><span class="lines">@@ -44,8 +44,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-JSCustomElementInterface::JSCustomElementInterface(JSObject* constructor, JSDOMGlobalObject* globalObject)
</del><ins>+JSCustomElementInterface::JSCustomElementInterface(const QualifiedName& name, JSObject* constructor, JSDOMGlobalObject* globalObject)
</ins><span class="cx"> : ActiveDOMCallback(globalObject->scriptExecutionContext())
</span><ins>+ , m_name(name)
</ins><span class="cx"> , m_constructor(constructor)
</span><span class="cx"> , m_isolatedWorld(&globalObject->world())
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCustomElementInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCustomElementInterface.h (197611 => 197612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCustomElementInterface.h 2016-03-05 07:50:54 UTC (rev 197611)
+++ trunk/Source/WebCore/bindings/js/JSCustomElementInterface.h 2016-03-05 08:31:38 UTC (rev 197612)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #if ENABLE(CUSTOM_ELEMENTS)
</span><span class="cx">
</span><span class="cx"> #include "ActiveDOMCallback.h"
</span><ins>+#include "QualifiedName.h"
</ins><span class="cx"> #include <heap/Weak.h>
</span><span class="cx"> #include <heap/WeakInlines.h>
</span><span class="cx"> #include <runtime/JSObject.h>
</span><span class="lines">@@ -50,14 +51,13 @@
</span><span class="cx"> class Element;
</span><span class="cx"> class JSDOMGlobalObject;
</span><span class="cx"> class MathMLElement;
</span><del>-class QualifiedName;
</del><span class="cx"> class SVGElement;
</span><span class="cx">
</span><span class="cx"> class JSCustomElementInterface : public RefCounted<JSCustomElementInterface>, public ActiveDOMCallback {
</span><span class="cx"> public:
</span><del>- static Ref<JSCustomElementInterface> create(JSC::JSObject* callback, JSDOMGlobalObject* globalObject)
</del><ins>+ static Ref<JSCustomElementInterface> create(const QualifiedName& name, JSC::JSObject* callback, JSDOMGlobalObject* globalObject)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new JSCustomElementInterface(callback, globalObject));
</del><ins>+ return adoptRef(*new JSCustomElementInterface(name, callback, globalObject));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> enum class ShouldClearException { Clear, DoNotClear };
</span><span class="lines">@@ -68,11 +68,14 @@
</span><span class="cx"> ScriptExecutionContext* scriptExecutionContext() const { return ContextDestructionObserver::scriptExecutionContext(); }
</span><span class="cx"> JSC::JSObject* constructor() { return m_constructor.get(); }
</span><span class="cx">
</span><ins>+ const QualifiedName& name() const { return m_name; }
+
</ins><span class="cx"> virtual ~JSCustomElementInterface();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- JSCustomElementInterface(JSC::JSObject* callback, JSDOMGlobalObject*);
</del><ins>+ JSCustomElementInterface(const QualifiedName&, JSC::JSObject* callback, JSDOMGlobalObject*);
</ins><span class="cx">
</span><ins>+ QualifiedName m_name;
</ins><span class="cx"> mutable JSC::Weak<JSC::JSObject> m_constructor;
</span><span class="cx"> RefPtr<DOMWrapperWorld> m_isolatedWorld;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDocumentCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp (197611 => 197612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2016-03-05 07:50:54 UTC (rev 197611)
+++ trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2016-03-05 08:31:38 UTC (rev 197612)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> // FIXME: 14. Let attributeChangedCallback be Get(prototype, "attributeChangedCallback"). Rethrow any exceptions.
</span><span class="cx">
</span><span class="cx"> QualifiedName name(nullAtom, tagName, HTMLNames::xhtmlNamespaceURI);
</span><del>- definitions.defineElement(name, JSCustomElementInterface::create(object, globalObject()));
</del><ins>+ definitions.addElementDefinition(JSCustomElementInterface::create(name, object, globalObject()));
</ins><span class="cx"> PrivateName uniquePrivateName;
</span><span class="cx"> globalObject()->putDirect(globalObject()->vm(), uniquePrivateName, object);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSHTMLElementCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp (197611 => 197612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp 2016-03-05 07:50:54 UTC (rev 197611)
+++ trunk/Source/WebCore/bindings/js/JSHTMLElementCustom.cpp 2016-03-05 08:31:38 UTC (rev 197612)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> VM& vm = state->vm();
</span><span class="cx"> JSValue newTargetValue = state->thisValue();
</span><span class="cx"> JSObject* newTarget = newTargetValue.getObject();
</span><del>- QualifiedName fullName = definitions->findName(newTarget);
- if (fullName == nullQName())
</del><ins>+ auto* interface = definitions->findInterface(newTarget);
+ if (!interface)
</ins><span class="cx"> return throwVMTypeError(state, "new.target does not define a custom element");
</span><span class="cx">
</span><span class="cx"> auto* globalObject = jsConstructor->globalObject();
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> if (UNLIKELY(state->hadException()))
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><del>- Ref<HTMLElement> element = HTMLElement::create(fullName, document);
</del><ins>+ Ref<HTMLElement> element = HTMLElement::create(interface->name(), document);
</ins><span class="cx"> auto* jsElement = JSHTMLElement::create(newElementStructure, globalObject, element.get());
</span><span class="cx"> cacheWrapper(globalObject->world(), element.ptr(), jsElement);
</span><span class="cx"> return JSValue::encode(jsElement);
</span></span></pre></div>
<a id="trunkSourceWebCoredomCustomElementDefinitionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CustomElementDefinitions.cpp (197611 => 197612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CustomElementDefinitions.cpp 2016-03-05 07:50:54 UTC (rev 197611)
+++ trunk/Source/WebCore/dom/CustomElementDefinitions.cpp 2016-03-05 08:31:38 UTC (rev 197612)
</span><span class="lines">@@ -69,40 +69,35 @@
</span><span class="cx"> return NameStatus::Valid;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CustomElementDefinitions::defineElement(const QualifiedName& fullName, Ref<JSCustomElementInterface>&& interface)
</del><ins>+void CustomElementDefinitions::addElementDefinition(Ref<JSCustomElementInterface>&& interface)
</ins><span class="cx"> {
</span><del>- ASSERT(!m_nameMap.contains(fullName.localName()));
- auto* constructor = interface->constructor();
- m_nameMap.add(fullName.localName(), CustomElementInfo(fullName, WTFMove(interface)));
-
- auto addResult = m_constructorMap.add(constructor, fullName);
- if (!addResult.isNewEntry)
- addResult.iterator->value = nullQName(); // The interface has multiple tag names associated with it.
-
- return true;
</del><ins>+ AtomicString localName = interface->name().localName();
+ ASSERT(!m_nameMap.contains(localName));
+ m_constructorMap.add(interface->constructor(), interface.ptr());
+ m_nameMap.add(localName, WTFMove(interface));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSCustomElementInterface* CustomElementDefinitions::findInterface(const QualifiedName& name) const
</span><span class="cx"> {
</span><span class="cx"> auto it = m_nameMap.find(name.localName());
</span><del>- return it == m_nameMap.end() || it->value.fullName != name ? nullptr : it->value.interface.get();
</del><ins>+ return it == m_nameMap.end() || it->value->name() != name ? nullptr : it->value.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSCustomElementInterface* CustomElementDefinitions::findInterface(const AtomicString& name) const
</span><span class="cx"> {
</span><span class="cx"> auto it = m_nameMap.find(name);
</span><del>- return it == m_nameMap.end() ? nullptr : it->value.interface.get();
</del><ins>+ return it == m_nameMap.end() ? nullptr : it->value.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool CustomElementDefinitions::containsConstructor(const JSC::JSObject* constructor) const
</del><ins>+JSCustomElementInterface* CustomElementDefinitions::findInterface(const JSC::JSObject* constructor) const
</ins><span class="cx"> {
</span><del>- return m_constructorMap.contains(constructor);
</del><ins>+ auto it = m_constructorMap.find(constructor);
+ return it->value;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-const QualifiedName& CustomElementDefinitions::findName(const JSC::JSObject* constructor) const
</del><ins>+bool CustomElementDefinitions::containsConstructor(const JSC::JSObject* constructor) const
</ins><span class="cx"> {
</span><del>- auto it = m_constructorMap.find(constructor);
- return it == m_constructorMap.end() ? nullQName() : it->value;
</del><ins>+ return m_constructorMap.contains(constructor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomCustomElementDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/CustomElementDefinitions.h (197611 => 197612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/CustomElementDefinitions.h 2016-03-05 07:50:54 UTC (rev 197611)
+++ trunk/Source/WebCore/dom/CustomElementDefinitions.h 2016-03-05 08:31:38 UTC (rev 197612)
</span><span class="lines">@@ -48,35 +48,19 @@
</span><span class="cx"> class CustomElementDefinitions {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- bool defineElement(const QualifiedName&, Ref<JSCustomElementInterface>&&);
</del><ins>+ void addElementDefinition(Ref<JSCustomElementInterface>&&);
</ins><span class="cx">
</span><span class="cx"> JSCustomElementInterface* findInterface(const QualifiedName&) const;
</span><span class="cx"> JSCustomElementInterface* findInterface(const AtomicString&) const;
</span><ins>+ JSCustomElementInterface* findInterface(const JSC::JSObject*) const;
</ins><span class="cx"> bool containsConstructor(const JSC::JSObject*) const;
</span><del>- const QualifiedName& findName(const JSC::JSObject*) const;
</del><span class="cx">
</span><span class="cx"> enum class NameStatus { Valid, ConflictsWithBuiltinNames, NoHyphen, ContainsUpperCase };
</span><span class="cx"> static NameStatus checkName(const AtomicString& tagName);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- class CustomElementInfo {
- WTF_MAKE_FAST_ALLOCATED;
- public:
- QualifiedName fullName;
- RefPtr<JSCustomElementInterface> interface;
-
- CustomElementInfo()
- : fullName(nullQName())
- { }
-
- CustomElementInfo(const QualifiedName& name, Ref<JSCustomElementInterface>&& interface)
- : fullName(name)
- , interface(WTFMove(interface))
- { }
- };
-
- HashMap<AtomicString, CustomElementInfo> m_nameMap;
- HashMap<const JSC::JSObject*, QualifiedName> m_constructorMap;
</del><ins>+ HashMap<AtomicString, RefPtr<JSCustomElementInterface>> m_nameMap;
+ HashMap<const JSC::JSObject*, JSCustomElementInterface*> m_constructorMap;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>