<!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>[171773] branches/safari-600.1.4-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/171773">171773</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-29 15:46:44 -0700 (Tue, 29 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre><a href="http://trac.webkit.org/projects/webkit/changeset/171675">r171675</a>. &lt;rdar://problem/17826572&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari60014branchLayoutTestsChangeLog">branches/safari-600.1.4-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari60014branchSourceWebCoreChangeLog">branches/safari-600.1.4-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari60014branchSourceWebCorecssSelectorCheckercpp">branches/safari-600.1.4-branch/Source/WebCore/css/SelectorChecker.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari60014branchLayoutTestsfasthistorynestedvisitedtestcomplexexpectedtxt">branches/safari-600.1.4-branch/LayoutTests/fast/history/nested-visited-test-complex-expected.txt</a></li>
<li><a href="#branchessafari60014branchLayoutTestsfasthistorynestedvisitedtestcomplexhtml">branches/safari-600.1.4-branch/LayoutTests/fast/history/nested-visited-test-complex.html</a></li>
<li><a href="#branchessafari60014branchLayoutTestsfasthistorysiblingvisitedtestcomplexexpectedtxt">branches/safari-600.1.4-branch/LayoutTests/fast/history/sibling-visited-test-complex-expected.txt</a></li>
<li><a href="#branchessafari60014branchLayoutTestsfasthistorysiblingvisitedtestcomplexhtml">branches/safari-600.1.4-branch/LayoutTests/fast/history/sibling-visited-test-complex.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari60014branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4-branch/LayoutTests/ChangeLog (171772 => 171773)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/LayoutTests/ChangeLog        2014-07-29 22:41:19 UTC (rev 171772)
+++ branches/safari-600.1.4-branch/LayoutTests/ChangeLog        2014-07-29 22:46:44 UTC (rev 171773)
</span><span class="lines">@@ -1,26 +1,3 @@
</span><del>-2014-07-29  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
-
-        Merge r171675. &lt;rdar://problem/17826572&gt;
-
-    2014-07-28  Yusuke Suzuki  &lt;utatane.tea@gmail.com&gt;
-    
-            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.
-    
</del><span class="cx"> 2014-07-27  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r171661. &lt;rdar://problem/17315237&gt;
</span></span></pre></div>
<a id="branchessafari60014branchLayoutTestsfasthistorynestedvisitedtestcomplexexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-600.1.4-branch/LayoutTests/fast/history/nested-visited-test-complex-expected.txt (171772 => 171773)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/LayoutTests/fast/history/nested-visited-test-complex-expected.txt        2014-07-29 22:41:19 UTC (rev 171772)
+++ branches/safari-600.1.4-branch/LayoutTests/fast/history/nested-visited-test-complex-expected.txt        2014-07-29 22:46:44 UTC (rev 171773)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-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
-
</del></span></pre></div>
<a id="branchessafari60014branchLayoutTestsfasthistorynestedvisitedtestcomplexhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-600.1.4-branch/LayoutTests/fast/history/nested-visited-test-complex.html (171772 => 171773)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/LayoutTests/fast/history/nested-visited-test-complex.html        2014-07-29 22:41:19 UTC (rev 171772)
+++ branches/safari-600.1.4-branch/LayoutTests/fast/history/nested-visited-test-complex.html        2014-07-29 22:46:44 UTC (rev 171773)
</span><span class="lines">@@ -1,44 +0,0 @@
</span><del>-&lt;html&gt;
-&lt;head&gt;
-&lt;script src=&quot;../../resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
-&lt;script&gt;
-jsTestIsAsync = true;
-
-if (window.testRunner)
-    window.testRunner.keepWebHistory();
-
-function compareStyles()
-{
-    var anchor = document.createElement(&quot;a&quot;);
-    anchor.href=&quot;resources/dummy.html&quot;;
-    anchor.setAttribute(&quot;id&quot;, &quot;one&quot;);
-    anchor.classList.add(&quot;ok&quot;);
-    anchor.classList.add(&quot;ng&quot;);
-    anchor.innerHTML = &quot;One&quot;;
-    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);
-    }
-}
-&lt;/script&gt;
-&lt;style&gt;
-a { color: green }
-:visited.ok &gt; a.ok { color: orange }
-:visited.ok &gt; span.ok { color: orange }
-&lt;/style&gt;
-&lt;/head&gt;
-&lt;body onload=&quot;compareStyles()&quot;&gt;
-&lt;iframe src=&quot;resources/dummy.html&quot; style=&quot;display:none&quot;&gt;&lt;/iframe&gt;
-
-&lt;p&gt;These contents (not underline) of two links should be different colors (green and orange):&lt;/p&gt;
-&lt;p style=&quot;color:green&quot;&gt;
-&lt;a id=&quot;enclosure&quot; class=&quot;ok&quot; href=&quot;resources/dummy.html&quot;&gt;&lt;/a&gt;
-&lt;a class=&quot;ok&quot; href=&quot;resources/dummy.html&quot;&gt;&lt;span class=&quot;ok&quot; id=&quot;two&quot;&gt;Two&lt;/span&gt;&lt;/a&gt;
-&lt;/p&gt;
-&lt;div id=console&gt;&lt;/div&gt;
-&lt;/body&gt;
-&lt;script src=&quot;../../resources/js-test-post.js&quot;&gt;&lt;/script&gt;
-&lt;/html&gt;
</del></span></pre></div>
<a id="branchessafari60014branchLayoutTestsfasthistorysiblingvisitedtestcomplexexpectedtxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-600.1.4-branch/LayoutTests/fast/history/sibling-visited-test-complex-expected.txt (171772 => 171773)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/LayoutTests/fast/history/sibling-visited-test-complex-expected.txt        2014-07-29 22:41:19 UTC (rev 171772)
+++ branches/safari-600.1.4-branch/LayoutTests/fast/history/sibling-visited-test-complex-expected.txt        2014-07-29 22:46:44 UTC (rev 171773)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>-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
-
</del></span></pre></div>
<a id="branchessafari60014branchLayoutTestsfasthistorysiblingvisitedtestcomplexhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-600.1.4-branch/LayoutTests/fast/history/sibling-visited-test-complex.html (171772 => 171773)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/LayoutTests/fast/history/sibling-visited-test-complex.html        2014-07-29 22:41:19 UTC (rev 171772)
+++ branches/safari-600.1.4-branch/LayoutTests/fast/history/sibling-visited-test-complex.html        2014-07-29 22:46:44 UTC (rev 171773)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-&lt;html&gt;
-&lt;head&gt;
-&lt;script src=&quot;../../resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
-&lt;script&gt;
-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);
-    }
-}
-&lt;/script&gt;
-&lt;style&gt;
-:link { color: orange }
-:visited + :link.ok { color: green }
-:visited { color: green }
-&lt;/style&gt;
-&lt;/head&gt;
-&lt;body onload=&quot;compareStyles()&quot;&gt;
-&lt;iframe src=&quot;resources/dummy.html&quot; style=&quot;display:none&quot;&gt;&lt;/iframe&gt;
-
-&lt;p&gt;These two links should be different colors (green and orange):&lt;/p&gt;
-&lt;p style=&quot;color:green&quot;&gt;
-&lt;a href=&quot;resources/dummy.html&quot; class=&quot;ok&quot; id=&quot;one&quot;&gt;One&lt;/a&gt;
-&lt;a href=&quot;http://madeup.site.com&quot; class=&quot;ok&quot; id=&quot;two&quot;&gt;Two&lt;/a&gt;
-&lt;/p&gt;
-&lt;div id=console&gt;&lt;/div&gt;
-&lt;/body&gt;
-&lt;script src=&quot;../../resources/js-test-post.js&quot;&gt;&lt;/script&gt;
-&lt;/html&gt;
</del></span></pre></div>
<a id="branchessafari60014branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4-branch/Source/WebCore/ChangeLog (171772 => 171773)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/Source/WebCore/ChangeLog        2014-07-29 22:41:19 UTC (rev 171772)
+++ branches/safari-600.1.4-branch/Source/WebCore/ChangeLog        2014-07-29 22:46:44 UTC (rev 171773)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2014-07-29  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Rollout r171675. &lt;rdar://problem/17826572&gt;
+
+    2014-07-29  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+            Merge r171675. &lt;rdar://problem/17826572&gt;
+
+        2014-07-28  Yusuke Suzuki  &lt;utatane.tea@gmail.com&gt;
+        
+                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):
+
+2014-07-29  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
</ins><span class="cx">         Rollout r171702. &lt;rdar://problem/16828238&gt;
</span><span class="cx"> 
</span><span class="cx">     2014-07-29  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari60014branchSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4-branch/Source/WebCore/css/SelectorChecker.cpp (171772 => 171773)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4-branch/Source/WebCore/css/SelectorChecker.cpp        2014-07-29 22:41:19 UTC (rev 171772)
+++ branches/safari-600.1.4-branch/Source/WebCore/css/SelectorChecker.cpp        2014-07-29 22:46:44 UTC (rev 171773)
</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.element-&gt;isLink() || (relation != CSSSelector::Descendant &amp;&amp; relation != CSSSelector::Child))
</del><ins>+        if (context.firstSelectorOfTheFragment == context.selector &amp;&amp; (context.element-&gt;isLink() || (relation != CSSSelector::Descendant &amp;&amp; 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>