<!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>[167631] 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/167631">167631</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-21 15:25:42 -0700 (Mon, 21 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add Element.matches, the standard name for webkitMatchesSelector
https://bugs.webkit.org/show_bug.cgi?id=131922
Reviewed by Andreas Kling.
Source/WebCore:
This patch just renames webkitMatchesSelector() to matches().
* bindings/scripts/CodeGeneratorObjC.pm:
(GenerateImplementation):
The Objective-C binding generator only supported ImplementedAs for getters and setters.
This adds support for the option so that Element.matches can be generated for Obj-C.
* dom/Element.cpp:
(WebCore::Element::matches):
(WebCore::Element::webkitMatchesSelector): Deleted.
* dom/Element.h:
* dom/Element.idl:
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::buildArrayForMatchedRuleList):
LayoutTests:
Update the tests to verify both Element.matches and Element.webkitMatchesSelector
* fast/dom/SelectorAPI/attrname-case-insensitive-expected.txt:
* fast/dom/SelectorAPI/attrname-case-insensitive.html:
* fast/dom/SelectorAPI/attrname-case-sensitive-expected.txt:
* fast/dom/SelectorAPI/attrname-case-sensitive.xhtml:
* fast/dom/SelectorAPI/caseID-almost-strict-expected.txt:
* fast/dom/SelectorAPI/caseID-almost-strict.html:
* fast/dom/SelectorAPI/caseID-expected.txt:
* fast/dom/SelectorAPI/caseID-strict-expected.txt:
* fast/dom/SelectorAPI/caseID-strict.html:
* fast/dom/SelectorAPI/caseID.html:
* fast/dom/SelectorAPI/caseTag-expected.txt:
* fast/dom/SelectorAPI/caseTag.html:
* fast/dom/SelectorAPI/caseTagX-expected.txt:
* fast/dom/SelectorAPI/caseTagX.xhtml:
* fast/dom/SelectorAPI/detached-element-expected.txt:
* fast/dom/SelectorAPI/not-supported-namespace-in-selector-expected.txt:
* fast/dom/SelectorAPI/not-supported-namespace-in-selector.html:
* fast/dom/SelectorAPI/script-tests/detached-element.js:
* fast/dom/SelectorAPI/script-tests/undefined-null-stringify.js:
* fast/dom/SelectorAPI/script-tests/viewless-document.js:
* fast/dom/SelectorAPI/undefined-null-stringify-expected.txt:
* fast/dom/SelectorAPI/viewless-document-expected.txt:
* fast/forms/radio/radio-live-validation-style-expected.txt:
* fast/forms/radio/radio-live-validation-style.html:
* fast/harness/results.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIattrnamecaseinsensitiveexpectedtxt">trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-insensitive-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIattrnamecaseinsensitivehtml">trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-insensitive.html</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIattrnamecasesensitiveexpectedtxt">trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-sensitive-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIattrnamecasesensitivexhtml">trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-sensitive.xhtml</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIcaseIDalmoststrictexpectedtxt">trunk/LayoutTests/fast/dom/SelectorAPI/caseID-almost-strict-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIcaseIDalmoststricthtml">trunk/LayoutTests/fast/dom/SelectorAPI/caseID-almost-strict.html</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIcaseIDexpectedtxt">trunk/LayoutTests/fast/dom/SelectorAPI/caseID-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIcaseIDstrictexpectedtxt">trunk/LayoutTests/fast/dom/SelectorAPI/caseID-strict-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIcaseIDstricthtml">trunk/LayoutTests/fast/dom/SelectorAPI/caseID-strict.html</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIcaseIDhtml">trunk/LayoutTests/fast/dom/SelectorAPI/caseID.html</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIcaseTagexpectedtxt">trunk/LayoutTests/fast/dom/SelectorAPI/caseTag-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIcaseTaghtml">trunk/LayoutTests/fast/dom/SelectorAPI/caseTag.html</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIcaseTagXexpectedtxt">trunk/LayoutTests/fast/dom/SelectorAPI/caseTagX-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIcaseTagXxhtml">trunk/LayoutTests/fast/dom/SelectorAPI/caseTagX.xhtml</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIdetachedelementexpectedtxt">trunk/LayoutTests/fast/dom/SelectorAPI/detached-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPInotsupportednamespaceinselectorexpectedtxt">trunk/LayoutTests/fast/dom/SelectorAPI/not-supported-namespace-in-selector-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPInotsupportednamespaceinselectorhtml">trunk/LayoutTests/fast/dom/SelectorAPI/not-supported-namespace-in-selector.html</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIscripttestsdetachedelementjs">trunk/LayoutTests/fast/dom/SelectorAPI/script-tests/detached-element.js</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIscripttestsundefinednullstringifyjs">trunk/LayoutTests/fast/dom/SelectorAPI/script-tests/undefined-null-stringify.js</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIscripttestsviewlessdocumentjs">trunk/LayoutTests/fast/dom/SelectorAPI/script-tests/viewless-document.js</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIundefinednullstringifyexpectedtxt">trunk/LayoutTests/fast/dom/SelectorAPI/undefined-null-stringify-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomSelectorAPIviewlessdocumentexpectedtxt">trunk/LayoutTests/fast/dom/SelectorAPI/viewless-document-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsradioradiolivevalidationstyleexpectedtxt">trunk/LayoutTests/fast/forms/radio/radio-live-validation-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastformsradioradiolivevalidationstylehtml">trunk/LayoutTests/fast/forms/radio/radio-live-validation-style.html</a></li>
<li><a href="#trunkLayoutTestsfastharnessresultshtml">trunk/LayoutTests/fast/harness/results.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptstestObjCDOMTestObjmm">trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomElementidl">trunk/Source/WebCore/dom/Element.idl</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgentcpp">trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/ChangeLog 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-04-21 Benjamin Poulain <benjamin@webkit.org>
+
+ Add Element.matches, the standard name for webkitMatchesSelector
+ https://bugs.webkit.org/show_bug.cgi?id=131922
+
+ Reviewed by Andreas Kling.
+
+ Update the tests to verify both Element.matches and Element.webkitMatchesSelector
+
+ * fast/dom/SelectorAPI/attrname-case-insensitive-expected.txt:
+ * fast/dom/SelectorAPI/attrname-case-insensitive.html:
+ * fast/dom/SelectorAPI/attrname-case-sensitive-expected.txt:
+ * fast/dom/SelectorAPI/attrname-case-sensitive.xhtml:
+ * fast/dom/SelectorAPI/caseID-almost-strict-expected.txt:
+ * fast/dom/SelectorAPI/caseID-almost-strict.html:
+ * fast/dom/SelectorAPI/caseID-expected.txt:
+ * fast/dom/SelectorAPI/caseID-strict-expected.txt:
+ * fast/dom/SelectorAPI/caseID-strict.html:
+ * fast/dom/SelectorAPI/caseID.html:
+ * fast/dom/SelectorAPI/caseTag-expected.txt:
+ * fast/dom/SelectorAPI/caseTag.html:
+ * fast/dom/SelectorAPI/caseTagX-expected.txt:
+ * fast/dom/SelectorAPI/caseTagX.xhtml:
+ * fast/dom/SelectorAPI/detached-element-expected.txt:
+ * fast/dom/SelectorAPI/not-supported-namespace-in-selector-expected.txt:
+ * fast/dom/SelectorAPI/not-supported-namespace-in-selector.html:
+ * fast/dom/SelectorAPI/script-tests/detached-element.js:
+ * fast/dom/SelectorAPI/script-tests/undefined-null-stringify.js:
+ * fast/dom/SelectorAPI/script-tests/viewless-document.js:
+ * fast/dom/SelectorAPI/undefined-null-stringify-expected.txt:
+ * fast/dom/SelectorAPI/viewless-document-expected.txt:
+ * fast/forms/radio/radio-live-validation-style-expected.txt:
+ * fast/forms/radio/radio-live-validation-style.html:
+ * fast/harness/results.html:
+
</ins><span class="cx"> 2014-04-21 Rik Cabanier <cabanier@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Blending] Remove support for non-separable blend modes from mix-blend-mode
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIattrnamecaseinsensitiveexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-insensitive-expected.txt (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-insensitive-expected.txt 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-insensitive-expected.txt 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -1,24 +1,34 @@
</span><span class="cx"> PASS document.querySelector('div[baR]') is document.getElementById('bar')
</span><ins>+PASS document.getElementById('bar').matches('div[baR]') is true
</ins><span class="cx"> PASS document.getElementById('bar').webkitMatchesSelector('div[baR]') is true
</span><span class="cx"> PASS document.querySelector('div[bar]') is document.getElementById('bar')
</span><ins>+PASS document.getElementById('bar').matches('div[bar]') is true
</ins><span class="cx"> PASS document.getElementById('bar').webkitMatchesSelector('div[bar]') is true
</span><span class="cx"> PASS document.querySelector('div[BAR]') is document.getElementById('bar')
</span><ins>+PASS document.getElementById('bar').matches('div[BAR]') is true
</ins><span class="cx"> PASS document.getElementById('bar').webkitMatchesSelector('div[BAR]') is true
</span><span class="cx"> PASS document.querySelector('div[bAR]') is document.getElementById('bar')
</span><ins>+PASS document.getElementById('bar').matches('div[bAR]') is true
</ins><span class="cx"> PASS document.getElementById('bar').webkitMatchesSelector('div[bAR]') is true
</span><span class="cx"> PASS document.querySelector('div[baR="10"]') is document.getElementById('bar')
</span><ins>+PASS document.getElementById('bar').matches('div[baR="10"]') is true
</ins><span class="cx"> PASS document.getElementById('bar').webkitMatchesSelector('div[baR="10"]') is true
</span><span class="cx"> PASS document.querySelector('div[bar="10"]') is document.getElementById('bar')
</span><ins>+PASS document.getElementById('bar').matches('div[bar="10"]') is true
</ins><span class="cx"> PASS document.getElementById('bar').webkitMatchesSelector('div[bar="10"]') is true
</span><span class="cx"> PASS document.querySelector('div[BAR="10"]') is document.getElementById('bar')
</span><ins>+PASS document.getElementById('bar').matches('div[BAR="10"]') is true
</ins><span class="cx"> PASS document.getElementById('bar').webkitMatchesSelector('div[BAR="10"]') is true
</span><span class="cx"> PASS document.querySelector('div[bAR="10"]') is document.getElementById('bar')
</span><ins>+PASS document.getElementById('bar').matches('div[bAR="10"]') is true
</ins><span class="cx"> PASS document.getElementById('bar').webkitMatchesSelector('div[bAR="10"]') is true
</span><span class="cx"> PASS document.querySelector('path[pathLength]') is document.getElementById('pa')
</span><ins>+PASS document.getElementById('pa').matches('path[pathLength]') is true
</ins><span class="cx"> PASS document.getElementById('pa').webkitMatchesSelector('path[pathLength]') is true
</span><span class="cx"> PASS content.querySelector('path[pathlength]') is null
</span><span class="cx"> PASS content.querySelector('path[pathLengTh]') is null
</span><span class="cx"> PASS document.querySelector('path[pathLength="200"]') is document.getElementById('pa')
</span><ins>+PASS document.getElementById('pa').matches('path[pathLength="200"]') is true
</ins><span class="cx"> PASS document.getElementById('pa').webkitMatchesSelector('path[pathLength="200"]') is true
</span><span class="cx"> PASS content.querySelector('path[pathlength="200"]') is null
</span><span class="cx"> PASS content.querySelector('path[pathLengTh="200"]') is null
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIattrnamecaseinsensitivehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-insensitive.html (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-insensitive.html 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-insensitive.html 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> var content = document.getElementById("content");
</span><span class="cx"> function checkMatchingSelector(selector, elementId) {
</span><span class="cx"> shouldBe("document.querySelector('" + selector + "')", "document.getElementById('" + elementId + "')");
</span><ins>+ shouldBeTrue("document.getElementById('" + elementId + "').matches('" + selector + "')");
</ins><span class="cx"> shouldBeTrue("document.getElementById('" + elementId + "').webkitMatchesSelector('" + selector + "')");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIattrnamecasesensitiveexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-sensitive-expected.txt (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-sensitive-expected.txt 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-sensitive-expected.txt 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -1,18 +1,22 @@
</span><span class="cx"> PASS document.querySelector('div[baR]') is document.getElementById('bar')
</span><ins>+PASS document.getElementById('bar').matches('div[baR]') is true
</ins><span class="cx"> PASS document.getElementById('bar').webkitMatchesSelector('div[baR]') is true
</span><span class="cx"> PASS content.querySelector('div[bar]') is null
</span><span class="cx"> PASS content.querySelector('div[BAR]') is null
</span><span class="cx"> PASS content.querySelector('div[bAR]') is null
</span><span class="cx"> PASS document.querySelector('div[baR="10"]') is document.getElementById('bar')
</span><ins>+PASS document.getElementById('bar').matches('div[baR="10"]') is true
</ins><span class="cx"> PASS document.getElementById('bar').webkitMatchesSelector('div[baR="10"]') is true
</span><span class="cx"> PASS content.querySelector('div[bar="10"]') is null
</span><span class="cx"> PASS content.querySelector('div[BAR="10"]') is null
</span><span class="cx"> PASS content.querySelector('div[bAR="10"]') is null
</span><span class="cx"> PASS document.querySelector('path[pathLength]') is document.getElementById('pa')
</span><ins>+PASS document.getElementById('pa').matches('path[pathLength]') is true
</ins><span class="cx"> PASS document.getElementById('pa').webkitMatchesSelector('path[pathLength]') is true
</span><span class="cx"> PASS content.querySelector('path[pathlength]') is null
</span><span class="cx"> PASS content.querySelector('path[pathLengTh]') is null
</span><span class="cx"> PASS document.querySelector('path[pathLength="200"]') is document.getElementById('pa')
</span><ins>+PASS document.getElementById('pa').matches('path[pathLength="200"]') is true
</ins><span class="cx"> PASS document.getElementById('pa').webkitMatchesSelector('path[pathLength="200"]') is true
</span><span class="cx"> PASS content.querySelector('path[pathlength="200"]') is null
</span><span class="cx"> PASS content.querySelector('path[pathLengTh="200"]') is null
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIattrnamecasesensitivexhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-sensitive.xhtml (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-sensitive.xhtml 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/attrname-case-sensitive.xhtml 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> var content = document.getElementById("content");
</span><span class="cx"> function checkMatchingSelector(selector, elementId) {
</span><span class="cx"> shouldBe("document.querySelector('" + selector + "')", "document.getElementById('" + elementId + "')");
</span><ins>+ shouldBeTrue("document.getElementById('" + elementId + "').matches('" + selector + "')");
</ins><span class="cx"> shouldBeTrue("document.getElementById('" + elementId + "').webkitMatchesSelector('" + selector + "')");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIcaseIDalmoststrictexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseID-almost-strict-expected.txt (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/caseID-almost-strict-expected.txt 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseID-almost-strict-expected.txt 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -2,6 +2,10 @@
</span><span class="cx"> PASS document.querySelector('#LOWER2') is null
</span><span class="cx"> PASS document.querySelector('#UPPER1').textContent is 'UPPER 1'
</span><span class="cx"> PASS document.querySelector('#upper2') is null
</span><ins>+PASS document.getElementById('lower1').matches('#lower1') is true
+PASS document.getElementById('lower2').matches('#LOWER2') is false
+PASS document.getElementById('UPPER1').matches('#UPPER1') is true
+PASS document.getElementById('UPPER2').matches('#upper2') is false
</ins><span class="cx"> PASS document.getElementById('lower1').webkitMatchesSelector('#lower1') is true
</span><span class="cx"> PASS document.getElementById('lower2').webkitMatchesSelector('#LOWER2') is false
</span><span class="cx"> PASS document.getElementById('UPPER1').webkitMatchesSelector('#UPPER1') is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIcaseIDalmoststricthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseID-almost-strict.html (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/caseID-almost-strict.html 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseID-almost-strict.html 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -16,6 +16,10 @@
</span><span class="cx"> shouldBe("document.querySelector('#UPPER1').textContent", "'UPPER 1'");
</span><span class="cx"> shouldBeNull("document.querySelector('#upper2')");
</span><span class="cx">
</span><ins>+ shouldBeTrue("document.getElementById('lower1').matches('#lower1')");
+ shouldBeFalse("document.getElementById('lower2').matches('#LOWER2')");
+ shouldBeTrue("document.getElementById('UPPER1').matches('#UPPER1')");
+ shouldBeFalse("document.getElementById('UPPER2').matches('#upper2')");
</ins><span class="cx"> shouldBeTrue("document.getElementById('lower1').webkitMatchesSelector('#lower1')");
</span><span class="cx"> shouldBeFalse("document.getElementById('lower2').webkitMatchesSelector('#LOWER2')");
</span><span class="cx"> shouldBeTrue("document.getElementById('UPPER1').webkitMatchesSelector('#UPPER1')");
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIcaseIDexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseID-expected.txt (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/caseID-expected.txt 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseID-expected.txt 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -2,6 +2,10 @@
</span><span class="cx"> PASS document.querySelector('#LOWER2').textContent is 'lower 2'
</span><span class="cx"> PASS document.querySelector('#UPPER1').textContent is 'UPPER 1'
</span><span class="cx"> PASS document.querySelector('#upper2').textContent is 'UPPER 2'
</span><ins>+PASS document.getElementById('lower1').matches('#lower1') is true
+PASS document.getElementById('lower2').matches('#LOWER2') is true
+PASS document.getElementById('UPPER1').matches('#UPPER1') is true
+PASS document.getElementById('UPPER2').matches('#upper2') is true
</ins><span class="cx"> PASS document.getElementById('lower1').webkitMatchesSelector('#lower1') is true
</span><span class="cx"> PASS document.getElementById('lower2').webkitMatchesSelector('#LOWER2') is true
</span><span class="cx"> PASS document.getElementById('UPPER1').webkitMatchesSelector('#UPPER1') is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIcaseIDstrictexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseID-strict-expected.txt (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/caseID-strict-expected.txt 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseID-strict-expected.txt 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -2,6 +2,10 @@
</span><span class="cx"> PASS document.querySelector('#LOWER2') is null
</span><span class="cx"> PASS document.querySelector('#UPPER1').textContent is 'UPPER 1'
</span><span class="cx"> PASS document.querySelector('#upper2') is null
</span><ins>+PASS document.getElementById('lower1').matches('#lower1') is true
+PASS document.getElementById('lower2').matches('#LOWER2') is false
+PASS document.getElementById('UPPER1').matches('#UPPER1') is true
+PASS document.getElementById('UPPER2').matches('#upper2') is false
</ins><span class="cx"> PASS document.getElementById('lower1').webkitMatchesSelector('#lower1') is true
</span><span class="cx"> PASS document.getElementById('lower2').webkitMatchesSelector('#LOWER2') is false
</span><span class="cx"> PASS document.getElementById('UPPER1').webkitMatchesSelector('#UPPER1') is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIcaseIDstricthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseID-strict.html (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/caseID-strict.html 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseID-strict.html 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -16,6 +16,10 @@
</span><span class="cx"> shouldBe("document.querySelector('#UPPER1').textContent", "'UPPER 1'");
</span><span class="cx"> shouldBeNull("document.querySelector('#upper2')");
</span><span class="cx">
</span><ins>+ shouldBeTrue("document.getElementById('lower1').matches('#lower1')");
+ shouldBeFalse("document.getElementById('lower2').matches('#LOWER2')");
+ shouldBeTrue("document.getElementById('UPPER1').matches('#UPPER1')");
+ shouldBeFalse("document.getElementById('UPPER2').matches('#upper2')");
</ins><span class="cx"> shouldBeTrue("document.getElementById('lower1').webkitMatchesSelector('#lower1')");
</span><span class="cx"> shouldBeFalse("document.getElementById('lower2').webkitMatchesSelector('#LOWER2')");
</span><span class="cx"> shouldBeTrue("document.getElementById('UPPER1').webkitMatchesSelector('#UPPER1')");
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIcaseIDhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseID.html (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/caseID.html 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseID.html 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -15,6 +15,10 @@
</span><span class="cx"> shouldBe("document.querySelector('#UPPER1').textContent", "'UPPER 1'");
</span><span class="cx"> shouldBe("document.querySelector('#upper2').textContent", "'UPPER 2'");
</span><span class="cx">
</span><ins>+ shouldBeTrue("document.getElementById('lower1').matches('#lower1')");
+ shouldBeTrue("document.getElementById('lower2').matches('#LOWER2')");
+ shouldBeTrue("document.getElementById('UPPER1').matches('#UPPER1')");
+ shouldBeTrue("document.getElementById('UPPER2').matches('#upper2')");
</ins><span class="cx"> shouldBeTrue("document.getElementById('lower1').webkitMatchesSelector('#lower1')");
</span><span class="cx"> shouldBeTrue("document.getElementById('lower2').webkitMatchesSelector('#LOWER2')");
</span><span class="cx"> shouldBeTrue("document.getElementById('UPPER1').webkitMatchesSelector('#UPPER1')");
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIcaseTagexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseTag-expected.txt (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/caseTag-expected.txt 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseTag-expected.txt 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx"> PASS document.querySelector('div SPAN').textContent is 'lower'
</span><span class="cx"> PASS document.querySelector('div p').textContent is 'UPPER'
</span><ins>+PASS document.getElementById('lower1').matches('div SPAN') is true
+PASS document.getElementById('UPPER1').matches('div p') is true
</ins><span class="cx"> PASS document.getElementById('lower1').webkitMatchesSelector('div SPAN') is true
</span><span class="cx"> PASS document.getElementById('UPPER1').webkitMatchesSelector('div p') is true
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIcaseTaghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseTag.html (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/caseTag.html 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseTag.html 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -11,6 +11,8 @@
</span><span class="cx"> shouldBe("document.querySelector('div SPAN').textContent", "'lower'");
</span><span class="cx"> shouldBe("document.querySelector('div p').textContent", "'UPPER'");
</span><span class="cx">
</span><ins>+ shouldBeTrue("document.getElementById('lower1').matches('div SPAN')");
+ shouldBeTrue("document.getElementById('UPPER1').matches('div p')");
</ins><span class="cx"> shouldBeTrue("document.getElementById('lower1').webkitMatchesSelector('div SPAN')");
</span><span class="cx"> shouldBeTrue("document.getElementById('UPPER1').webkitMatchesSelector('div p')");
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIcaseTagXexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseTagX-expected.txt (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/caseTagX-expected.txt 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseTagX-expected.txt 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> PASS document.querySelector('div SPAN') is null
</span><ins>+PASS document.getElementById('lower1').matches('div SPAN') is false
</ins><span class="cx"> PASS document.getElementById('lower1').webkitMatchesSelector('div SPAN') is false
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIcaseTagXxhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/caseTagX.xhtml (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/caseTagX.xhtml 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/caseTagX.xhtml 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> <![CDATA[
</span><span class="cx"> shouldBeNull("document.querySelector('div SPAN')");
</span><span class="cx">
</span><ins>+ shouldBeFalse("document.getElementById('lower1').matches('div SPAN')");
</ins><span class="cx"> shouldBeFalse("document.getElementById('lower1').webkitMatchesSelector('div SPAN')");
</span><span class="cx"> ]]>
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIdetachedelementexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/detached-element-expected.txt (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/detached-element-expected.txt 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/detached-element-expected.txt 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -11,6 +11,8 @@
</span><span class="cx"> PASS root.querySelectorAll('#testId').item(0) is correctNode
</span><span class="cx"> PASS noChild.querySelector('div') is null
</span><span class="cx"> PASS noChild.querySelectorAll('div').length is 0
</span><ins>+PASS correctNode.matches('div') is true
+PASS correctNode.matches('#testId') is true
</ins><span class="cx"> PASS correctNode.webkitMatchesSelector('div') is true
</span><span class="cx"> PASS correctNode.webkitMatchesSelector('#testId') is true
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPInotsupportednamespaceinselectorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/not-supported-namespace-in-selector-expected.txt (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/not-supported-namespace-in-selector-expected.txt 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/not-supported-namespace-in-selector-expected.txt 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -2,39 +2,51 @@
</span><span class="cx">
</span><span class="cx"> PASS: document.querySelector('bbb|pre') throws: Error: NamespaceError: DOM Exception 14
</span><span class="cx"> PASS: document.querySelectorAll('bbb|pre') throws: Error: NamespaceError: DOM Exception 14
</span><ins>+PASS: document.body.matches('bbb|pre') throws: Error: NamespaceError: DOM Exception 14
</ins><span class="cx"> PASS: document.body.webkitMatchesSelector('bbb|pre') throws: Error: NamespaceError: DOM Exception 14
</span><span class="cx"> PASS: document.querySelector('*|pre') did not throw
</span><span class="cx"> PASS: document.querySelectorAll('*|pre') did not throw
</span><ins>+PASS: document.body.matches('*|pre') did not throw
</ins><span class="cx"> PASS: document.body.webkitMatchesSelector('*|pre') did not throw
</span><span class="cx"> PASS: document.querySelector('|pre') did not throw
</span><span class="cx"> PASS: document.querySelectorAll('|pre') did not throw
</span><ins>+PASS: document.body.matches('|pre') did not throw
</ins><span class="cx"> PASS: document.body.webkitMatchesSelector('|pre') did not throw
</span><span class="cx"> PASS: document.querySelector('div bbb|pre') throws: Error: NamespaceError: DOM Exception 14
</span><span class="cx"> PASS: document.querySelectorAll('div bbb|pre') throws: Error: NamespaceError: DOM Exception 14
</span><ins>+PASS: document.body.matches('div bbb|pre') throws: Error: NamespaceError: DOM Exception 14
</ins><span class="cx"> PASS: document.body.webkitMatchesSelector('div bbb|pre') throws: Error: NamespaceError: DOM Exception 14
</span><span class="cx"> PASS: document.querySelector('div *|pre') did not throw
</span><span class="cx"> PASS: document.querySelectorAll('div *|pre') did not throw
</span><ins>+PASS: document.body.matches('div *|pre') did not throw
</ins><span class="cx"> PASS: document.body.webkitMatchesSelector('div *|pre') did not throw
</span><span class="cx"> PASS: document.querySelector('div |pre') did not throw
</span><span class="cx"> PASS: document.querySelectorAll('div |pre') did not throw
</span><ins>+PASS: document.body.matches('div |pre') did not throw
</ins><span class="cx"> PASS: document.body.webkitMatchesSelector('div |pre') did not throw
</span><span class="cx"> PASS: document.querySelector('[bbb|name=value]') throws: Error: NamespaceError: DOM Exception 14
</span><span class="cx"> PASS: document.querySelectorAll('[bbb|name=value]') throws: Error: NamespaceError: DOM Exception 14
</span><ins>+PASS: document.body.matches('[bbb|name=value]') throws: Error: NamespaceError: DOM Exception 14
</ins><span class="cx"> PASS: document.body.webkitMatchesSelector('[bbb|name=value]') throws: Error: NamespaceError: DOM Exception 14
</span><span class="cx"> PASS: document.querySelector('[*|name=value]') did not throw
</span><span class="cx"> PASS: document.querySelectorAll('[*|name=value]') did not throw
</span><ins>+PASS: document.body.matches('[*|name=value]') did not throw
</ins><span class="cx"> PASS: document.body.webkitMatchesSelector('[*|name=value]') did not throw
</span><span class="cx"> PASS: document.querySelector('[|name=value]') did not throw
</span><span class="cx"> PASS: document.querySelectorAll('[|name=value]') did not throw
</span><ins>+PASS: document.body.matches('[|name=value]') did not throw
</ins><span class="cx"> PASS: document.body.webkitMatchesSelector('[|name=value]') did not throw
</span><span class="cx"> PASS: document.querySelector(':-webkit-any(bbb|pre)') throws: Error: NamespaceError: DOM Exception 14
</span><span class="cx"> PASS: document.querySelector('div [bbb|name=value]') throws: Error: NamespaceError: DOM Exception 14
</span><span class="cx"> PASS: document.querySelectorAll('div [bbb|name=value]') throws: Error: NamespaceError: DOM Exception 14
</span><ins>+PASS: document.body.matches('div [bbb|name=value]') throws: Error: NamespaceError: DOM Exception 14
</ins><span class="cx"> PASS: document.body.webkitMatchesSelector('div [bbb|name=value]') throws: Error: NamespaceError: DOM Exception 14
</span><span class="cx"> PASS: document.querySelector('div [*|name=value]') did not throw
</span><span class="cx"> PASS: document.querySelectorAll('div [*|name=value]') did not throw
</span><ins>+PASS: document.body.matches('div [*|name=value]') did not throw
</ins><span class="cx"> PASS: document.body.webkitMatchesSelector('div [*|name=value]') did not throw
</span><span class="cx"> PASS: document.querySelector('div [|name=value]') did not throw
</span><span class="cx"> PASS: document.querySelectorAll('div [|name=value]') did not throw
</span><ins>+PASS: document.body.matches('div [|name=value]') did not throw
</ins><span class="cx"> PASS: document.body.webkitMatchesSelector('div [|name=value]') did not throw
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPInotsupportednamespaceinselectorhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/not-supported-namespace-in-selector.html (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/not-supported-namespace-in-selector.html 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/not-supported-namespace-in-selector.html 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -33,44 +33,56 @@
</span><span class="cx"> {
</span><span class="cx"> shouldThrow("document.querySelector('bbb|pre')");
</span><span class="cx"> shouldThrow("document.querySelectorAll('bbb|pre')");
</span><ins>+ shouldThrow("document.body.matches('bbb|pre')");
</ins><span class="cx"> shouldThrow("document.body.webkitMatchesSelector('bbb|pre')");
</span><span class="cx"> shouldNotThrow("document.querySelector('*|pre')");
</span><span class="cx"> shouldNotThrow("document.querySelectorAll('*|pre')");
</span><ins>+ shouldNotThrow("document.body.matches('*|pre')");
</ins><span class="cx"> shouldNotThrow("document.body.webkitMatchesSelector('*|pre')");
</span><span class="cx"> shouldNotThrow("document.querySelector('|pre')");
</span><span class="cx"> shouldNotThrow("document.querySelectorAll('|pre')");
</span><ins>+ shouldNotThrow("document.body.matches('|pre')");
</ins><span class="cx"> shouldNotThrow("document.body.webkitMatchesSelector('|pre')");
</span><span class="cx">
</span><span class="cx"> shouldThrow("document.querySelector('div bbb|pre')");
</span><span class="cx"> shouldThrow("document.querySelectorAll('div bbb|pre')");
</span><ins>+ shouldThrow("document.body.matches('div bbb|pre')");
</ins><span class="cx"> shouldThrow("document.body.webkitMatchesSelector('div bbb|pre')");
</span><span class="cx"> shouldNotThrow("document.querySelector('div *|pre')");
</span><span class="cx"> shouldNotThrow("document.querySelectorAll('div *|pre')");
</span><ins>+ shouldNotThrow("document.body.matches('div *|pre')");
</ins><span class="cx"> shouldNotThrow("document.body.webkitMatchesSelector('div *|pre')");
</span><span class="cx"> shouldNotThrow("document.querySelector('div |pre')");
</span><span class="cx"> shouldNotThrow("document.querySelectorAll('div |pre')");
</span><ins>+ shouldNotThrow("document.body.matches('div |pre')");
</ins><span class="cx"> shouldNotThrow("document.body.webkitMatchesSelector('div |pre')");
</span><span class="cx">
</span><span class="cx"> shouldThrow("document.querySelector('[bbb|name=value]')");
</span><span class="cx"> shouldThrow("document.querySelectorAll('[bbb|name=value]')");
</span><ins>+ shouldThrow("document.body.matches('[bbb|name=value]')");
</ins><span class="cx"> shouldThrow("document.body.webkitMatchesSelector('[bbb|name=value]')");
</span><span class="cx"> shouldNotThrow("document.querySelector('[*|name=value]')");
</span><span class="cx"> shouldNotThrow("document.querySelectorAll('[*|name=value]')");
</span><ins>+ shouldNotThrow("document.body.matches('[*|name=value]')");
</ins><span class="cx"> shouldNotThrow("document.body.webkitMatchesSelector('[*|name=value]')");
</span><span class="cx"> shouldNotThrow("document.querySelector('[|name=value]')");
</span><span class="cx"> shouldNotThrow("document.querySelectorAll('[|name=value]')");
</span><ins>+ shouldNotThrow("document.body.matches('[|name=value]')");
</ins><span class="cx"> shouldNotThrow("document.body.webkitMatchesSelector('[|name=value]')");
</span><span class="cx">
</span><span class="cx"> shouldThrow("document.querySelector(':-webkit-any(bbb|pre)')");
</span><span class="cx">
</span><span class="cx"> shouldThrow("document.querySelector('div [bbb|name=value]')");
</span><span class="cx"> shouldThrow("document.querySelectorAll('div [bbb|name=value]')");
</span><ins>+ shouldThrow("document.body.matches('div [bbb|name=value]')");
</ins><span class="cx"> shouldThrow("document.body.webkitMatchesSelector('div [bbb|name=value]')");
</span><span class="cx"> shouldNotThrow("document.querySelector('div [*|name=value]')");
</span><span class="cx"> shouldNotThrow("document.querySelectorAll('div [*|name=value]')");
</span><ins>+ shouldNotThrow("document.body.matches('div [*|name=value]')");
</ins><span class="cx"> shouldNotThrow("document.body.webkitMatchesSelector('div [*|name=value]')");
</span><span class="cx"> shouldNotThrow("document.querySelector('div [|name=value]')");
</span><span class="cx"> shouldNotThrow("document.querySelectorAll('div [|name=value]')");
</span><ins>+ shouldNotThrow("document.body.matches('div [|name=value]')");
</ins><span class="cx"> shouldNotThrow("document.body.webkitMatchesSelector('div [|name=value]')");
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIscripttestsdetachedelementjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/script-tests/detached-element.js (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/script-tests/detached-element.js 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/script-tests/detached-element.js 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -19,5 +19,7 @@
</span><span class="cx"> shouldBeNull("noChild.querySelector('div')");
</span><span class="cx"> shouldBe("noChild.querySelectorAll('div').length", "0");
</span><span class="cx">
</span><ins>+shouldBeTrue("correctNode.matches('div')");
+shouldBeTrue("correctNode.matches('#testId')");
</ins><span class="cx"> shouldBeTrue("correctNode.webkitMatchesSelector('div')");
</span><span class="cx"> shouldBeTrue("correctNode.webkitMatchesSelector('#testId')");
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIscripttestsundefinednullstringifyjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/script-tests/undefined-null-stringify.js (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/script-tests/undefined-null-stringify.js 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/script-tests/undefined-null-stringify.js 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -17,5 +17,7 @@
</span><span class="cx"> shouldBe("document.querySelectorAll(undefined).length", "1");
</span><span class="cx"> shouldBe("document.querySelectorAll(undefined).item(0)", "undefinedNode");
</span><span class="cx">
</span><ins>+shouldBeTrue("nullNode.matches(null)");
+shouldBeTrue("undefinedNode.matches(undefined)");
</ins><span class="cx"> shouldBeTrue("nullNode.webkitMatchesSelector(null)");
</span><span class="cx"> shouldBeTrue("undefinedNode.webkitMatchesSelector(undefined)");
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIscripttestsviewlessdocumentjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/script-tests/viewless-document.js (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/script-tests/viewless-document.js 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/script-tests/viewless-document.js 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -20,6 +20,10 @@
</span><span class="cx"> shouldBe("testDoc.querySelector('.d1')", "d1");
</span><span class="cx"> shouldBe("testDoc.querySelectorAll('p span').length", "1");
</span><span class="cx">
</span><ins>+shouldBeTrue("p1.matches('p')");
+shouldBeTrue("s1.matches('p span')");
+shouldBeTrue("s2.matches('#s2')");
+shouldBeTrue("d1.matches('.d1')");
</ins><span class="cx"> shouldBeTrue("p1.webkitMatchesSelector('p')");
</span><span class="cx"> shouldBeTrue("s1.webkitMatchesSelector('p span')");
</span><span class="cx"> shouldBeTrue("s2.webkitMatchesSelector('#s2')");
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIundefinednullstringifyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/undefined-null-stringify-expected.txt (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/undefined-null-stringify-expected.txt 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/undefined-null-stringify-expected.txt 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -9,6 +9,8 @@
</span><span class="cx"> PASS document.querySelectorAll(null).item(0) is nullNode
</span><span class="cx"> PASS document.querySelectorAll(undefined).length is 1
</span><span class="cx"> PASS document.querySelectorAll(undefined).item(0) is undefinedNode
</span><ins>+PASS nullNode.matches(null) is true
+PASS undefinedNode.matches(undefined) is true
</ins><span class="cx"> PASS nullNode.webkitMatchesSelector(null) is true
</span><span class="cx"> PASS undefinedNode.webkitMatchesSelector(undefined) is true
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomSelectorAPIviewlessdocumentexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/dom/SelectorAPI/viewless-document-expected.txt (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/SelectorAPI/viewless-document-expected.txt 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/dom/SelectorAPI/viewless-document-expected.txt 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -8,6 +8,10 @@
</span><span class="cx"> PASS testDoc.querySelectorAll('span').item(1) is s2
</span><span class="cx"> PASS testDoc.querySelector('.d1') is d1
</span><span class="cx"> PASS testDoc.querySelectorAll('p span').length is 1
</span><ins>+PASS p1.matches('p') is true
+PASS s1.matches('p span') is true
+PASS s2.matches('#s2') is true
+PASS d1.matches('.d1') is true
</ins><span class="cx"> PASS p1.webkitMatchesSelector('p') is true
</span><span class="cx"> PASS s1.webkitMatchesSelector('p span') is true
</span><span class="cx"> PASS s2.webkitMatchesSelector('#s2') is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsradioradiolivevalidationstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/radio/radio-live-validation-style-expected.txt (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/radio/radio-live-validation-style-expected.txt 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/forms/radio/radio-live-validation-style-expected.txt 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -6,7 +6,9 @@
</span><span class="cx"> Removing a checked radio button from a required radio button group by a DOM tree mutation:
</span><span class="cx"> PASS backgroundOf($("radio1")) is validColor
</span><span class="cx"> PASS parent.removeChild($("radio2")); backgroundOf($("radio1")) is invalidColor
</span><del>-PASS $("radio1").remove(); radio2.webkitMatchesSelector(":valid") is false
</del><ins>+PASS $("radio1").remove(); radio2.matches(":valid") is false
+PASS radio2.remove(); radio2.matches(":valid") is true
+FAIL $("radio1").remove(); radio2.webkitMatchesSelector(":valid") should be false. Threw exception TypeError: null is not an object (evaluating '$("radio1").remove')
</ins><span class="cx"> PASS radio2.remove(); radio2.webkitMatchesSelector(":valid") is true
</span><span class="cx">
</span><span class="cx"> Removing a checked radio button from a required radio button group by name attribute change:
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsradioradiolivevalidationstylehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/forms/radio/radio-live-validation-style.html (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/radio/radio-live-validation-style.html 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/forms/radio/radio-live-validation-style.html 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> '<input type=radio name=group1 required id=radio2>' +
</span><span class="cx"> '<input type=radio name=group1 required id=radio3>';
</span><span class="cx"> var radio2 = $('radio2');
</span><ins>+shouldBeFalse('$("radio1").remove(); radio2.matches(":valid")');
+shouldBeTrue('radio2.remove(); radio2.matches(":valid")');
</ins><span class="cx"> shouldBeFalse('$("radio1").remove(); radio2.webkitMatchesSelector(":valid")');
</span><span class="cx"> shouldBeTrue('radio2.remove(); radio2.webkitMatchesSelector(":valid")');
</span><span class="cx"> debug('');
</span></span></pre></div>
<a id="trunkLayoutTestsfastharnessresultshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/harness/results.html (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/harness/results.html 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/LayoutTests/fast/harness/results.html 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -273,6 +273,9 @@
</span><span class="cx">
</span><span class="cx"> function matchesSelector(node, selector)
</span><span class="cx"> {
</span><ins>+ if (node.matches)
+ return node.matches(selector);
+
</ins><span class="cx"> if (node.webkitMatchesSelector)
</span><span class="cx"> return node.webkitMatchesSelector(selector);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/Source/WebCore/ChangeLog 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-04-21 Benjamin Poulain <benjamin@webkit.org>
+
+ Add Element.matches, the standard name for webkitMatchesSelector
+ https://bugs.webkit.org/show_bug.cgi?id=131922
+
+ Reviewed by Andreas Kling.
+
+ This patch just renames webkitMatchesSelector() to matches().
+
+ * bindings/scripts/CodeGeneratorObjC.pm:
+ (GenerateImplementation):
+ The Objective-C binding generator only supported ImplementedAs for getters and setters.
+ This adds support for the option so that Element.matches can be generated for Obj-C.
+
+ * dom/Element.cpp:
+ (WebCore::Element::matches):
+ (WebCore::Element::webkitMatchesSelector): Deleted.
+ * dom/Element.h:
+ * dom/Element.idl:
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::buildArrayForMatchedRuleList):
+
</ins><span class="cx"> 2014-04-21 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> topContentInset does not play well with fullscreen elements
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -1559,7 +1559,8 @@
</span><span class="cx"> unshift(@parameterNames, $caller);
</span><span class="cx"> $content = "${implementedBy}::" . $codeGenerator->WK_lcfirst($functionName) . "(" . join(", ", @parameterNames) . ")";
</span><span class="cx"> } else {
</span><del>- $content = "$caller->" . $codeGenerator->WK_lcfirst($functionName) . "(" . join(", ", @parameterNames) . ")";
</del><ins>+ my $functionImplementationName = $function->signature->extendedAttributes->{"ImplementedAs"} || $codeGenerator->WK_lcfirst($functionName);
+ $content = "$caller->" . $functionImplementationName . "(" . join(", ", @parameterNames) . ")";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ($returnType eq "void") {
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptstestObjCDOMTestObjmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -1139,7 +1139,7 @@
</span><span class="cx"> - (void)orange
</span><span class="cx"> {
</span><span class="cx"> WebCore::JSMainThreadNullState state;
</span><del>- IMPL->orange();
</del><ins>+ IMPL->banana();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (DOMbool *)strictFunction:(NSString *)str a:(float)a b:(int)b
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -2296,7 +2296,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Element::webkitMatchesSelector(const String& selector, ExceptionCode& ec)
</del><ins>+bool Element::matches(const String& selector, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> SelectorQuery* selectorQuery = document().selectorQueryForString(selector, ec);
</span><span class="cx"> return selectorQuery && selectorQuery->matches(*this);
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/Source/WebCore/dom/Element.h 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool matchesReadOnlyPseudoClass() const;
</span><span class="cx"> virtual bool matchesReadWritePseudoClass() const;
</span><del>- bool webkitMatchesSelector(const String& selectors, ExceptionCode&);
</del><ins>+ bool matches(const String& selectors, ExceptionCode&);
</ins><span class="cx"> virtual bool shouldAppearIndeterminate() const;
</span><span class="cx">
</span><span class="cx"> DOMTokenList* classList();
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.idl (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.idl 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/Source/WebCore/dom/Element.idl 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -107,8 +107,8 @@
</span><span class="cx"> [RaisesException] Element querySelector(DOMString selectors);
</span><span class="cx"> [RaisesException] NodeList querySelectorAll(DOMString selectors);
</span><span class="cx">
</span><del>- // WebKit extension, pending specification.
- [RaisesException] boolean webkitMatchesSelector([Default=Undefined] optional DOMString selectors);
</del><ins>+ [RaisesException] boolean matches([Default=Undefined] optional DOMString selectors);
+ [ImplementedAs=matches, RaisesException] boolean webkitMatchesSelector([Default=Undefined] optional DOMString selectors);
</ins><span class="cx">
</span><span class="cx"> // ElementTraversal API
</span><span class="cx"> readonly attribute Element firstElementChild;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (167630 => 167631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2014-04-21 22:22:35 UTC (rev 167630)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2014-04-21 22:25:42 UTC (rev 167631)
</span><span class="lines">@@ -1158,7 +1158,7 @@
</span><span class="cx"> const CSSSelectorList& selectorList = matchedStyleRule->selectorList();
</span><span class="cx"> long index = 0;
</span><span class="cx"> for (const CSSSelector* selector = selectorList.first(); selector; selector = CSSSelectorList::next(selector)) {
</span><del>- bool matched = element->webkitMatchesSelector(selector->selectorText(), IGNORE_EXCEPTION);
</del><ins>+ bool matched = element->matches(selector->selectorText(), IGNORE_EXCEPTION);
</ins><span class="cx"> if (matched)
</span><span class="cx"> matchingSelectors->addItem(index);
</span><span class="cx"> ++index;
</span></span></pre>
</div>
</div>
</body>
</html>