<!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>[171726] branches/safari-600.1-branch</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/171726">171726</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-07-29 01:18:04 -0700 (Tue, 29 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/171675">r171675</a>. <rdar://problem/17826572></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCorecssSelectorCheckercpp">branches/safari-600.1-branch/Source/WebCore/css/SelectorChecker.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsfasthistorynestedvisitedtestcomplexexpectedtxt">branches/safari-600.1-branch/LayoutTests/fast/history/nested-visited-test-complex-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestsfasthistorynestedvisitedtestcomplexhtml">branches/safari-600.1-branch/LayoutTests/fast/history/nested-visited-test-complex.html</a></li>
<li><a href="#branchessafari6001branchLayoutTestsfasthistorysiblingvisitedtestcomplexexpectedtxt">branches/safari-600.1-branch/LayoutTests/fast/history/sibling-visited-test-complex-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestsfasthistorysiblingvisitedtestcomplexhtml">branches/safari-600.1-branch/LayoutTests/fast/history/sibling-visited-test-complex.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (171725 => 171726)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-07-29 08:12:46 UTC (rev 171725)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-07-29 08:18:04 UTC (rev 171726)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-07-29 Lucas Forschler <lforschler@apple.com>
+
+ Merge r171675
+
+ 2014-07-28 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ CSS: Fix :visited behavior for SubSelectors
+ https://bugs.webkit.org/show_bug.cgi?id=135324
+
+ Reviewed by Benjamin Poulain.
+
+ Disable :visited match for the selectors that has SubSelectors.
+ This `isSubSelector` (`context.firstSelectorOfTheFragment == context.selector`) is intended to
+ check `relation != CSSSelector::SubSelector`.
+ But since this value belongs to the previous selector and it is tested inside the branch that checks
+ the next selector isn't SubSelector `relation != CSSSelector::SubSelector`,
+ this only matches when the previous selector doesn't has SubSelectors.
+
+ * fast/history/nested-visited-test-complex-expected.txt: Added.
+ * fast/history/nested-visited-test-complex.html: Added.
+ * fast/history/sibling-visited-test-complex-expected.txt: Added.
+ * fast/history/sibling-visited-test-complex.html: Added.
+
</ins><span class="cx"> 2014-07-28 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Update test expectations.
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestsfasthistorynestedvisitedtestcomplexexpectedtxtfromrev171675trunkLayoutTestsfasthistorynestedvisitedtestcomplexexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/fast/history/nested-visited-test-complex-expected.txt (from rev 171675, trunk/LayoutTests/fast/history/nested-visited-test-complex-expected.txt) (0 => 171726)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/fast/history/nested-visited-test-complex-expected.txt (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/fast/history/nested-visited-test-complex-expected.txt 2014-07-29 08:18:04 UTC (rev 171726)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+These contents (not underline) of two links should be different colors (green and orange):
+
+One Two
+
+PASS firstStyle.color became different from secondStyle.color
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsfasthistorynestedvisitedtestcomplexhtmlfromrev171675trunkLayoutTestsfasthistorynestedvisitedtestcomplexhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/fast/history/nested-visited-test-complex.html (from rev 171675, trunk/LayoutTests/fast/history/nested-visited-test-complex.html) (0 => 171726)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/fast/history/nested-visited-test-complex.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/fast/history/nested-visited-test-complex.html 2014-07-29 08:18:04 UTC (rev 171726)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+jsTestIsAsync = true;
+
+if (window.testRunner)
+ window.testRunner.keepWebHistory();
+
+function compareStyles()
+{
+ var anchor = document.createElement("a");
+ anchor.href="resources/dummy.html";
+ anchor.setAttribute("id", "one");
+ anchor.classList.add("ok");
+ anchor.classList.add("ng");
+ anchor.innerHTML = "One";
+ document.getElementById('enclosure').appendChild(anchor);
+
+ if (window.internals) {
+ firstStyle = internals.computedStyleIncludingVisitedInfo(document.getElementById('one'));
+ secondStyle = internals.computedStyleIncludingVisitedInfo(document.getElementById('two'));
+ shouldBecomeDifferent('firstStyle.color', 'secondStyle.color', finishJSTest);
+ }
+}
+</script>
+<style>
+a { color: green }
+:visited.ok > a.ok { color: orange }
+:visited.ok > span.ok { color: orange }
+</style>
+</head>
+<body onload="compareStyles()">
+<iframe src="resources/dummy.html" style="display:none"></iframe>
+
+<p>These contents (not underline) of two links should be different colors (green and orange):</p>
+<p style="color:green">
+<a id="enclosure" class="ok" href="resources/dummy.html"></a>
+<a class="ok" href="resources/dummy.html"><span class="ok" id="two">Two</span></a>
+</p>
+<div id=console></div>
+</body>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsfasthistorysiblingvisitedtestcomplexexpectedtxtfromrev171675trunkLayoutTestsfasthistorysiblingvisitedtestcomplexexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/fast/history/sibling-visited-test-complex-expected.txt (from rev 171675, trunk/LayoutTests/fast/history/sibling-visited-test-complex-expected.txt) (0 => 171726)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/fast/history/sibling-visited-test-complex-expected.txt (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/fast/history/sibling-visited-test-complex-expected.txt 2014-07-29 08:18:04 UTC (rev 171726)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+These two links should be different colors (green and orange):
+
+One Two
+
+PASS firstStyle.color became different from secondStyle.color
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestsfasthistorysiblingvisitedtestcomplexhtmlfromrev171675trunkLayoutTestsfasthistorysiblingvisitedtestcomplexhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/fast/history/sibling-visited-test-complex.html (from rev 171675, trunk/LayoutTests/fast/history/sibling-visited-test-complex.html) (0 => 171726)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/fast/history/sibling-visited-test-complex.html (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/fast/history/sibling-visited-test-complex.html 2014-07-29 08:18:04 UTC (rev 171726)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+jsTestIsAsync = true;
+
+if (window.testRunner)
+ window.testRunner.keepWebHistory();
+
+function compareStyles()
+{
+ if (window.internals) {
+ firstStyle = internals.computedStyleIncludingVisitedInfo(document.getElementById('one'));
+ secondStyle = internals.computedStyleIncludingVisitedInfo(document.getElementById('two'));
+ shouldBecomeDifferent('firstStyle.color', 'secondStyle.color', finishJSTest);
+ }
+}
+</script>
+<style>
+:link { color: orange }
+:visited + :link.ok { color: green }
+:visited { color: green }
+</style>
+</head>
+<body onload="compareStyles()">
+<iframe src="resources/dummy.html" style="display:none"></iframe>
+
+<p>These two links should be different colors (green and orange):</p>
+<p style="color:green">
+<a href="resources/dummy.html" class="ok" id="one">One</a>
+<a href="http://madeup.site.com" class="ok" id="two">Two</a>
+</p>
+<div id=console></div>
+</body>
+<script src="../../resources/js-test-post.js"></script>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (171725 => 171726)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-29 08:12:46 UTC (rev 171725)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-07-29 08:18:04 UTC (rev 171726)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-07-29 Lucas Forschler <lforschler@apple.com>
+
+ Merge r171675
+
+ 2014-07-28 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ CSS: Fix :visited behavior for SubSelectors
+ https://bugs.webkit.org/show_bug.cgi?id=135324
+
+ Reviewed by Benjamin Poulain.
+
+ Disable :visited match for the selectors that has SubSelectors.
+
+ Tests: fast/history/nested-visited-test-complex.html
+ fast/history/sibling-visited-test-complex.html
+
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::matchRecursively):
+
</ins><span class="cx"> 2014-07-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171661. <rdar://problem/17315237>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/css/SelectorChecker.cpp (171725 => 171726)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/css/SelectorChecker.cpp 2014-07-29 08:12:46 UTC (rev 171725)
+++ branches/safari-600.1-branch/Source/WebCore/css/SelectorChecker.cpp 2014-07-29 08:18:04 UTC (rev 171726)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> return SelectorFailsCompletely;
</span><span class="cx">
</span><span class="cx"> // Disable :visited matching when we see the first link or try to match anything else than an ancestors.
</span><del>- if (context.firstSelectorOfTheFragment == context.selector && (context.element->isLink() || (relation != CSSSelector::Descendant && relation != CSSSelector::Child)))
</del><ins>+ if (context.element->isLink() || (relation != CSSSelector::Descendant && relation != CSSSelector::Child))
</ins><span class="cx"> nextContext.visitedMatchType = VisitedMatchDisabled;
</span><span class="cx">
</span><span class="cx"> nextContext.pseudoId = NOPSEUDO;
</span></span></pre>
</div>
</div>
</body>
</html>