<!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>[189252] 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/189252">189252</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-09-02 10:07:57 -0700 (Wed, 02 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>http/tests/w3c/dom/nodes/Element-matches.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=148615
Reviewed by Ryosuke Niwa.
Source/WebCore:
Several newly-imported w3c tests were flaky due to the :target
pseudo-class selectors sometimes giving different results. The
issue seems to be that this type of selector relies on the
Document::cssTarget() element to do the matching. We update
this cssTarget Element in FrameView's scrollToFragment() /
scrollToAnchor(). This is called from
scrollToFragmentWithParentBoundary() which is called by
FrameLoader's finishedParsing() and loadInSameDocument().
In the first one, it is called *after* calling checkComplete()
which fires the onload event. However, in the second method,
it is called *before*. This patch updates finishedParsing()
so that scrollToFragmentWithParentBoundary() is called *before*
firing the onload event, consistently with loadInSameDocument().
This makes sure that JavaScript executed in an onload event
handler will get accurate results for :target pseudo-class
selectors.
No new tests, covered by:
http/tests/w3c/dom/nodes/Element-matches.html
http/tests/w3c/dom/nodes/ParentNode-querySelector-All-xhtml.xhtml
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::finishedParsing):
LayoutTests:
Unskip the tests and rebaseline them now that the target pseudo selector
checks are consistently passing.
* TestExpectations:
* http/tests/w3c/dom/nodes/Element-matches-expected.txt:
* http/tests/w3c/dom/nodes/ParentNode-querySelector-All-expected.txt:
* http/tests/w3c/dom/nodes/ParentNode-querySelector-All-xhtml-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestshttptestsw3cdomnodesParentNodequerySelectorAllexpectedtxt">trunk/LayoutTests/http/tests/w3c/dom/nodes/ParentNode-querySelector-All-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsw3cdomnodesParentNodequerySelectorAllxhtmlexpectedtxt">trunk/LayoutTests/http/tests/w3c/dom/nodes/ParentNode-querySelector-All-xhtml-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (189251 => 189252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-09-02 17:07:34 UTC (rev 189251)
+++ trunk/LayoutTests/ChangeLog 2015-09-02 17:07:57 UTC (rev 189252)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-09-02 Chris Dumez <cdumez@apple.com>
+
+ http/tests/w3c/dom/nodes/Element-matches.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=148615
+
+ Reviewed by Ryosuke Niwa.
+
+ Unskip the tests and rebaseline them now that the target pseudo selector
+ checks are consistently passing.
+
+ * TestExpectations:
+ * http/tests/w3c/dom/nodes/Element-matches-expected.txt:
+ * http/tests/w3c/dom/nodes/ParentNode-querySelector-All-expected.txt:
+ * http/tests/w3c/dom/nodes/ParentNode-querySelector-All-xhtml-expected.txt:
+
</ins><span class="cx"> 2015-09-02 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Update iOS TestExpectations files
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (189251 => 189252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2015-09-02 17:07:34 UTC (rev 189251)
+++ trunk/LayoutTests/TestExpectations 2015-09-02 17:07:57 UTC (rev 189252)
</span><span class="lines">@@ -222,11 +222,6 @@
</span><span class="cx"> webkit.org/b/148546 [ Debug ] http/tests/w3c/dom/ranges/Range-mutations.html [ Skip ]
</span><span class="cx"> webkit.org/b/148546 [ Debug ] http/tests/w3c/dom/ranges/Range-set.html [ Skip ]
</span><span class="cx">
</span><del>-# Newly imported W3C DOM tests that are flaky.
-webkit.org/b/148615 http/tests/w3c/dom/nodes/Element-matches.html [ Failure Pass ]
-webkit.org/b/148615 http/tests/w3c/dom/nodes/ParentNode-querySelector-All.html [ Failure Pass ]
-webkit.org/b/148615 http/tests/w3c/dom/nodes/ParentNode-querySelector-All-xhtml.xhtml [ Failure Pass ]
-
</del><span class="cx"> # @supports W3C Failures
</span><span class="cx"> webkit.org/b/137566 css3/conditional/w3c/at-supports-010.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/137568 css3/conditional/w3c/at-supports-014.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsw3cdomnodesParentNodequerySelectorAllexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/w3c/dom/nodes/ParentNode-querySelector-All-expected.txt (189251 => 189252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/w3c/dom/nodes/ParentNode-querySelector-All-expected.txt 2015-09-02 17:07:34 UTC (rev 189251)
+++ trunk/LayoutTests/http/tests/w3c/dom/nodes/ParentNode-querySelector-All-expected.txt 2015-09-02 17:07:57 UTC (rev 189252)
</span><span class="lines">@@ -553,8 +553,8 @@
</span><span class="cx"> PASS Document.querySelector: :link and :visited pseudo-class selectors, matching a and area elements with href attributes: #pseudo-link :link, #pseudo-link :visited
</span><span class="cx"> PASS Document.querySelectorAll: :link and :visited pseudo-class selectors, matching link elements with href attributes: #head :link, #head :visited
</span><span class="cx"> PASS Document.querySelector: :link and :visited pseudo-class selectors, matching link elements with href attributes: #head :link, #head :visited
</span><del>-FAIL Document.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target assert_equals: The method should return the expected number of matches. expected 1 but got 0
-FAIL Document.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target assert_not_equals: The method should return a match. got disallowed value null
</del><ins>+PASS Document.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target
+PASS Document.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target
</ins><span class="cx"> PASS Document.querySelectorAll: :lang pseudo-class selector, matching inherited language: #pseudo-lang-div1:lang(en)
</span><span class="cx"> PASS Document.querySelector: :lang pseudo-class selector, matching inherited language: #pseudo-lang-div1:lang(en)
</span><span class="cx"> PASS Document.querySelectorAll: :lang pseudo-class selector, matching specified language with exact value: #pseudo-lang-div2:lang(fr)
</span><span class="lines">@@ -1803,8 +1803,8 @@
</span><span class="cx"> PASS In-document Element.querySelector: :link and :visited pseudo-class selectors, not matching link elements with href attributes: #head :link, #head :visited
</span><span class="cx"> PASS In-document Element.querySelectorAll: :link and :visited pseudo-class selectors, chained, mutually exclusive pseudo-classes match nothing: :link:visited
</span><span class="cx"> PASS In-document Element.querySelector: :link and :visited pseudo-class selectors, chained, mutually exclusive pseudo-classes match nothing: :link:visited
</span><del>-FAIL In-document Element.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target assert_equals: The method should return the expected number of matches. expected 1 but got 0
-FAIL In-document Element.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target assert_not_equals: The method should return a match. got disallowed value null
</del><ins>+PASS In-document Element.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target
+PASS In-document Element.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target
</ins><span class="cx"> PASS In-document Element.querySelectorAll: :lang pseudo-class selector, matching inherited language: #pseudo-lang-div1:lang(en)
</span><span class="cx"> PASS In-document Element.querySelector: :lang pseudo-class selector, matching inherited language: #pseudo-lang-div1:lang(en)
</span><span class="cx"> PASS In-document Element.querySelectorAll: :lang pseudo-class selector, matching specified language with exact value: #pseudo-lang-div2:lang(fr)
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsw3cdomnodesParentNodequerySelectorAllxhtmlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/w3c/dom/nodes/ParentNode-querySelector-All-xhtml-expected.txt (189251 => 189252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/w3c/dom/nodes/ParentNode-querySelector-All-xhtml-expected.txt 2015-09-02 17:07:34 UTC (rev 189251)
+++ trunk/LayoutTests/http/tests/w3c/dom/nodes/ParentNode-querySelector-All-xhtml-expected.txt 2015-09-02 17:07:57 UTC (rev 189252)
</span><span class="lines">@@ -553,8 +553,8 @@
</span><span class="cx"> PASS Document.querySelector: :link and :visited pseudo-class selectors, matching a and area elements with href attributes: #pseudo-link :link, #pseudo-link :visited
</span><span class="cx"> PASS Document.querySelectorAll: :link and :visited pseudo-class selectors, matching link elements with href attributes: #head :link, #head :visited
</span><span class="cx"> PASS Document.querySelector: :link and :visited pseudo-class selectors, matching link elements with href attributes: #head :link, #head :visited
</span><del>-FAIL Document.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target assert_equals: The method should return the expected number of matches. expected 1 but got 0
-FAIL Document.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target assert_not_equals: The method should return a match. got disallowed value null
</del><ins>+PASS Document.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target
+PASS Document.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target
</ins><span class="cx"> PASS Document.querySelectorAll: :lang pseudo-class selector, matching inherited language: #pseudo-lang-div1:lang(en)
</span><span class="cx"> PASS Document.querySelector: :lang pseudo-class selector, matching inherited language: #pseudo-lang-div1:lang(en)
</span><span class="cx"> PASS Document.querySelectorAll: :lang pseudo-class selector, matching specified language with exact value: #pseudo-lang-div2:lang(fr)
</span><span class="lines">@@ -1803,8 +1803,8 @@
</span><span class="cx"> PASS In-document Element.querySelector: :link and :visited pseudo-class selectors, not matching link elements with href attributes: #head :link, #head :visited
</span><span class="cx"> PASS In-document Element.querySelectorAll: :link and :visited pseudo-class selectors, chained, mutually exclusive pseudo-classes match nothing: :link:visited
</span><span class="cx"> PASS In-document Element.querySelector: :link and :visited pseudo-class selectors, chained, mutually exclusive pseudo-classes match nothing: :link:visited
</span><del>-FAIL In-document Element.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target assert_equals: The method should return the expected number of matches. expected 1 but got 0
-FAIL In-document Element.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target assert_not_equals: The method should return a match. got disallowed value null
</del><ins>+PASS In-document Element.querySelectorAll: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target
+PASS In-document Element.querySelector: :target pseudo-class selector, matching the element referenced by the URL fragment identifier: :target
</ins><span class="cx"> PASS In-document Element.querySelectorAll: :lang pseudo-class selector, matching inherited language: #pseudo-lang-div1:lang(en)
</span><span class="cx"> PASS In-document Element.querySelector: :lang pseudo-class selector, matching inherited language: #pseudo-lang-div1:lang(en)
</span><span class="cx"> PASS In-document Element.querySelectorAll: :lang pseudo-class selector, matching specified language with exact value: #pseudo-lang-div2:lang(fr)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189251 => 189252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-02 17:07:34 UTC (rev 189251)
+++ trunk/Source/WebCore/ChangeLog 2015-09-02 17:07:57 UTC (rev 189252)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-09-02 Chris Dumez <cdumez@apple.com>
+
+ http/tests/w3c/dom/nodes/Element-matches.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=148615
+
+ Reviewed by Ryosuke Niwa.
+
+ Several newly-imported w3c tests were flaky due to the :target
+ pseudo-class selectors sometimes giving different results. The
+ issue seems to be that this type of selector relies on the
+ Document::cssTarget() element to do the matching. We update
+ this cssTarget Element in FrameView's scrollToFragment() /
+ scrollToAnchor(). This is called from
+ scrollToFragmentWithParentBoundary() which is called by
+ FrameLoader's finishedParsing() and loadInSameDocument().
+
+ In the first one, it is called *after* calling checkComplete()
+ which fires the onload event. However, in the second method,
+ it is called *before*. This patch updates finishedParsing()
+ so that scrollToFragmentWithParentBoundary() is called *before*
+ firing the onload event, consistently with loadInSameDocument().
+ This makes sure that JavaScript executed in an onload event
+ handler will get accurate results for :target pseudo-class
+ selectors.
+
+ No new tests, covered by:
+ http/tests/w3c/dom/nodes/Element-matches.html
+ http/tests/w3c/dom/nodes/ParentNode-querySelector-All-xhtml.xhtml
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::finishedParsing):
+
</ins><span class="cx"> 2015-09-02 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Construct default winding string arguments in CanvasRenderingContext2D from ASCIILiteral objects
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (189251 => 189252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2015-09-02 17:07:34 UTC (rev 189251)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2015-09-02 17:07:57 UTC (rev 189252)
</span><span class="lines">@@ -753,6 +753,8 @@
</span><span class="cx">
</span><span class="cx"> m_client.dispatchDidFinishDocumentLoad();
</span><span class="cx">
</span><ins>+ scrollToFragmentWithParentBoundary(m_frame.document()->url());
+
</ins><span class="cx"> checkCompleted();
</span><span class="cx">
</span><span class="cx"> if (!m_frame.view())
</span><span class="lines">@@ -761,7 +763,6 @@
</span><span class="cx"> // Check if the scrollbars are really needed for the content.
</span><span class="cx"> // If not, remove them, relayout, and repaint.
</span><span class="cx"> m_frame.view()->restoreScrollbar();
</span><del>- scrollToFragmentWithParentBoundary(m_frame.document()->url());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameLoader::loadDone()
</span></span></pre>
</div>
</div>
</body>
</html>