<!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>[208674] trunk</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/208674">208674</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-11-13 23:06:52 -0800 (Sun, 13 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (204441): newsplex.com map does not load
https://bugs.webkit.org/show_bug.cgi?id=164705
<rdar://problem/28753438>
Reviewed by Darin Adler.
Source/WebCore:
Update getElementsByTagName(qualifiedName) implementation to match more closely
the specification at:
- https://dom.spec.whatwg.org/#dom-document-getelementsbytagname
- https://dom.spec.whatwg.org/#concept-getelementsbytagname
- https://dom.spec.whatwg.org/#concept-element-qualified-name
In particular, we no longer split the input qualifiedName into a prefix and a
localName in order to compare those to element.prefix() / element.localName().
Instead, we keep the input qualifiedName as is and compare it to the element's
qualifiedName. This matters for HTML elements inside an HTML document that have
a semicolon in their localname (e.g. 'wx:map'). For this example, the element's
localName and its qualified name are both 'wx:map'. Calling
getElementsByTagName('wx:map') should return it. However, if you split the input
qualifiedName into a prefix and a localName, you end up checking:
'wx' == null && 'map' == 'wx:map'
which does not match.
Test: fast/dom/getElementsByTagName-HTMLElement-prefix.html
* dom/TagCollection.cpp:
(WebCore::TagCollection::TagCollection):
(WebCore::TagCollection::~TagCollection):
(WebCore::HTMLTagCollection::HTMLTagCollection):
(WebCore::HTMLTagCollection::~HTMLTagCollection):
(WebCore::makeQualifiedName): Deleted.
(WebCore::splitQualifiedName): Deleted.
* dom/TagCollection.h:
(WebCore::TagCollection::elementMatches):
(WebCore::HTMLTagCollection::elementMatches):
LayoutTests:
* fast/dom/getElementsByTagName-HTMLElement-prefix-expected.txt: Added.
* fast/dom/getElementsByTagName-HTMLElement-prefix.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomTagCollectioncpp">trunk/Source/WebCore/dom/TagCollection.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTagCollectionh">trunk/Source/WebCore/dom/TagCollection.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomgetElementsByTagNameHTMLElementprefixexpectedtxt">trunk/LayoutTests/fast/dom/getElementsByTagName-HTMLElement-prefix-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomgetElementsByTagNameHTMLElementprefixhtml">trunk/LayoutTests/fast/dom/getElementsByTagName-HTMLElement-prefix.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208673 => 208674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-14 05:14:07 UTC (rev 208673)
+++ trunk/LayoutTests/ChangeLog 2016-11-14 07:06:52 UTC (rev 208674)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-13 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION (204441): newsplex.com map does not load
+ https://bugs.webkit.org/show_bug.cgi?id=164705
+ <rdar://problem/28753438>
+
+ Reviewed by Darin Adler.
+
+ * fast/dom/getElementsByTagName-HTMLElement-prefix-expected.txt: Added.
+ * fast/dom/getElementsByTagName-HTMLElement-prefix.html: Added.
+
</ins><span class="cx"> 2016-11-12 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a way to get the UI-side scrolling tree as text via UIScriptController
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomgetElementsByTagNameHTMLElementprefixexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/getElementsByTagName-HTMLElement-prefix-expected.txt (0 => 208674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/getElementsByTagName-HTMLElement-prefix-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/getElementsByTagName-HTMLElement-prefix-expected.txt 2016-11-14 07:06:52 UTC (rev 208674)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Tests that getElementsByTagName() works properly for elements that have a semicolon in their tag name, inside an HTML document.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS testElement.prefix is null
+PASS testElement.localName is "wx:map"
+PASS testElement.tagName is "WX:MAP"
+collection = document.getElementsByTagName("wx:map")
+PASS collection.length is 1
+PASS collection[0] is testElement
+collection = document.getElementsByTagName("WX:MAP")
+PASS collection.length is 1
+PASS collection[0] is testElement
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomgetElementsByTagNameHTMLElementprefixhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/getElementsByTagName-HTMLElement-prefix.html (0 => 208674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/getElementsByTagName-HTMLElement-prefix.html (rev 0)
+++ trunk/LayoutTests/fast/dom/getElementsByTagName-HTMLElement-prefix.html 2016-11-14 07:06:52 UTC (rev 208674)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script src="../../resources/js-test-pre.js"></script>
+<wx:map id="testElement"></wx:map>
+<script>
+description("Tests that getElementsByTagName() works properly for elements that have a semicolon in their tag name, inside an HTML document.");
+
+var testElement = document.getElementById("testElement");
+shouldBeNull("testElement.prefix");
+shouldBeEqualToString("testElement.localName", "wx:map");
+shouldBeEqualToString("testElement.tagName", "WX:MAP");
+
+evalAndLog('collection = document.getElementsByTagName("wx:map")');
+shouldBe("collection.length", "1");
+shouldBe("collection[0]", "testElement");
+
+evalAndLog('collection = document.getElementsByTagName("WX:MAP")');
+shouldBe("collection.length", "1");
+shouldBe("collection[0]", "testElement");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208673 => 208674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-14 05:14:07 UTC (rev 208673)
+++ trunk/Source/WebCore/ChangeLog 2016-11-14 07:06:52 UTC (rev 208674)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2016-11-13 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION (204441): newsplex.com map does not load
+ https://bugs.webkit.org/show_bug.cgi?id=164705
+ <rdar://problem/28753438>
+
+ Reviewed by Darin Adler.
+
+ Update getElementsByTagName(qualifiedName) implementation to match more closely
+ the specification at:
+ - https://dom.spec.whatwg.org/#dom-document-getelementsbytagname
+ - https://dom.spec.whatwg.org/#concept-getelementsbytagname
+ - https://dom.spec.whatwg.org/#concept-element-qualified-name
+
+ In particular, we no longer split the input qualifiedName into a prefix and a
+ localName in order to compare those to element.prefix() / element.localName().
+ Instead, we keep the input qualifiedName as is and compare it to the element's
+ qualifiedName. This matters for HTML elements inside an HTML document that have
+ a semicolon in their localname (e.g. 'wx:map'). For this example, the element's
+ localName and its qualified name are both 'wx:map'. Calling
+ getElementsByTagName('wx:map') should return it. However, if you split the input
+ qualifiedName into a prefix and a localName, you end up checking:
+ 'wx' == null && 'map' == 'wx:map'
+ which does not match.
+
+ Test: fast/dom/getElementsByTagName-HTMLElement-prefix.html
+
+ * dom/TagCollection.cpp:
+ (WebCore::TagCollection::TagCollection):
+ (WebCore::TagCollection::~TagCollection):
+ (WebCore::HTMLTagCollection::HTMLTagCollection):
+ (WebCore::HTMLTagCollection::~HTMLTagCollection):
+ (WebCore::makeQualifiedName): Deleted.
+ (WebCore::splitQualifiedName): Deleted.
+ * dom/TagCollection.h:
+ (WebCore::TagCollection::elementMatches):
+ (WebCore::HTMLTagCollection::elementMatches):
+
</ins><span class="cx"> 2016-11-13 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ExceptionCodePlaceholder
</span></span></pre></div>
<a id="trunkSourceWebCoredomTagCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TagCollection.cpp (208673 => 208674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TagCollection.cpp 2016-11-14 05:14:07 UTC (rev 208673)
+++ trunk/Source/WebCore/dom/TagCollection.cpp 2016-11-14 07:06:52 UTC (rev 208674)
</span><span class="lines">@@ -28,25 +28,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static inline AtomicString makeQualifiedName(const String& prefix, const String& localName)
-{
- if (LIKELY(prefix.isNull()))
- return localName;
- return prefix + ':' + localName;
-}
-
-static inline void splitQualifiedName(const String& qualifiedName, AtomicString& prefix, AtomicString& localName)
-{
- size_t index = qualifiedName.find(':');
- if (UNLIKELY(index == notFound))
- localName = qualifiedName;
- else {
- prefix = qualifiedName.substring(0, index);
- localName = qualifiedName.substring(index + 1);
- }
- ASSERT(makeQualifiedName(prefix, localName) == qualifiedName);
-}
-
</del><span class="cx"> TagCollectionNS::TagCollectionNS(ContainerNode& rootNode, const AtomicString& namespaceURI, const AtomicString& localName)
</span><span class="cx"> : CachedHTMLCollection<TagCollectionNS, CollectionTypeTraits<ByTag>::traversalType>(rootNode, ByTag)
</span><span class="cx"> , m_namespaceURI(namespaceURI)
</span><span class="lines">@@ -62,28 +43,27 @@
</span><span class="cx">
</span><span class="cx"> TagCollection::TagCollection(ContainerNode& rootNode, const AtomicString& qualifiedName)
</span><span class="cx"> : CachedHTMLCollection<TagCollection, CollectionTypeTraits<ByTag>::traversalType>(rootNode, ByTag)
</span><ins>+ , m_qualifiedName(qualifiedName)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(qualifiedName != starAtom);
</span><del>- splitQualifiedName(qualifiedName, m_prefix, m_localName);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TagCollection::~TagCollection()
</span><span class="cx"> {
</span><del>- ownerNode().nodeLists()->removeCachedCollection(this, makeQualifiedName(m_prefix, m_localName));
</del><ins>+ ownerNode().nodeLists()->removeCachedCollection(this, m_qualifiedName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLTagCollection::HTMLTagCollection(ContainerNode& rootNode, const AtomicString& qualifiedName)
</span><span class="cx"> : CachedHTMLCollection<HTMLTagCollection, CollectionTypeTraits<ByHTMLTag>::traversalType>(rootNode, ByHTMLTag)
</span><ins>+ , m_qualifiedName(qualifiedName)
+ , m_loweredQualifiedName(qualifiedName.convertToASCIILowercase())
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(qualifiedName != starAtom);
</span><del>- splitQualifiedName(qualifiedName, m_prefix, m_localName);
- m_loweredPrefix = m_prefix.convertToASCIILowercase();
- m_loweredLocalName = m_localName.convertToASCIILowercase();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLTagCollection::~HTMLTagCollection()
</span><span class="cx"> {
</span><del>- ownerNode().nodeLists()->removeCachedCollection(this, makeQualifiedName(m_prefix, m_localName));
</del><ins>+ ownerNode().nodeLists()->removeCachedCollection(this, m_qualifiedName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomTagCollectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TagCollection.h (208673 => 208674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TagCollection.h 2016-11-14 05:14:07 UTC (rev 208673)
+++ trunk/Source/WebCore/dom/TagCollection.h 2016-11-14 07:06:52 UTC (rev 208674)
</span><span class="lines">@@ -43,8 +43,7 @@
</span><span class="cx"> private:
</span><span class="cx"> TagCollection(ContainerNode& rootNode, const AtomicString& qualifiedName);
</span><span class="cx">
</span><del>- AtomicString m_prefix;
- AtomicString m_localName;
</del><ins>+ AtomicString m_qualifiedName;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class TagCollectionNS final : public CachedHTMLCollection<TagCollectionNS, CollectionTypeTraits<ByTag>::traversalType> {
</span><span class="lines">@@ -78,15 +77,13 @@
</span><span class="cx"> private:
</span><span class="cx"> HTMLTagCollection(ContainerNode& rootNode, const AtomicString& qualifiedName);
</span><span class="cx">
</span><del>- AtomicString m_prefix;
- AtomicString m_loweredPrefix;
- AtomicString m_localName;
- AtomicString m_loweredLocalName;
</del><ins>+ AtomicString m_qualifiedName;
+ AtomicString m_loweredQualifiedName;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline bool TagCollection::elementMatches(Element& element) const
</span><span class="cx"> {
</span><del>- return m_localName == element.localName() && m_prefix == element.prefix();
</del><ins>+ return m_qualifiedName == element.tagQName().toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool TagCollectionNS::elementMatches(Element& element) const
</span><span class="lines">@@ -99,8 +96,8 @@
</span><span class="cx"> inline bool HTMLTagCollection::elementMatches(Element& element) const
</span><span class="cx"> {
</span><span class="cx"> if (element.isHTMLElement())
</span><del>- return m_loweredLocalName == element.localName() && m_loweredPrefix == element.prefix();
- return m_localName == element.localName() && m_prefix == element.prefix();
</del><ins>+ return m_loweredQualifiedName == element.tagQName().toString();
+ return m_qualifiedName == element.tagQName().toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>