<!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>[193706] branches/safari-601.1.46.60-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/193706">193706</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-12-07 23:51:59 -0800 (Mon, 07 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/192389">r192389</a>.  rdar://problem/23786983</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari60114660branchLayoutTestsChangeLog">branches/safari-601.1.46.60-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari60114660branchSourceWebCoreChangeLog">branches/safari-601.1.46.60-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari60114660branchSourceWebCorerenderingRenderThemecpp">branches/safari-601.1.46.60-branch/Source/WebCore/rendering/RenderTheme.cpp</a></li>
<li><a href="#branchessafari60114660branchSourceWebCorerenderingstyleRenderStyleh">branches/safari-601.1.46.60-branch/Source/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari60114660branchLayoutTestsfastcsspseudovisitedbackgroundcoloroninputexpectedhtml">branches/safari-601.1.46.60-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input-expected.html</a></li>
<li><a href="#branchessafari60114660branchLayoutTestsfastcsspseudovisitedbackgroundcoloroninputhtml">branches/safari-601.1.46.60-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari60114660branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46.60-branch/LayoutTests/ChangeLog (193705 => 193706)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46.60-branch/LayoutTests/ChangeLog        2015-12-08 07:50:20 UTC (rev 193705)
+++ branches/safari-601.1.46.60-branch/LayoutTests/ChangeLog        2015-12-08 07:51:59 UTC (rev 193706)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-12-07  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r192389.
+
+    2015-11-12  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+            Ignore visited background color when deciding if the input renderer needs to be painted natively.
+            https://bugs.webkit.org/show_bug.cgi?id=151211
+            rdar://problem/21449823
+
+            Reviewed by Antti Koivisto.
+
+            * fast/css/pseudo-visited-background-color-on-input-expected.html: Added.
+            * fast/css/pseudo-visited-background-color-on-input.html: Added.
+
+2015-12-07  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
</ins><span class="cx">         Merge r192369.
</span><span class="cx"> 
</span><span class="cx">     2015-11-11  Jon Honeycutt  &lt;jhoneycutt@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari60114660branchLayoutTestsfastcsspseudovisitedbackgroundcoloroninputexpectedhtmlfromrev192389trunkLayoutTestsfastcsspseudovisitedbackgroundcoloroninputexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46.60-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input-expected.html (from rev 192389, trunk/LayoutTests/fast/css/pseudo-visited-background-color-on-input-expected.html) (0 => 193706)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46.60-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input-expected.html                                (rev 0)
+++ branches/safari-601.1.46.60-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input-expected.html        2015-12-08 07:51:59 UTC (rev 193706)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+&lt;!DOCTYPE HTML&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;This tests that we draw the input natively when :visited background-color is set.&lt;/title&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;button&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;submit&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;checkbox&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;file&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;checkbox&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;color&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;file&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;hidden&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;image&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;radio&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;range&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;reset&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;search&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="branchessafari60114660branchLayoutTestsfastcsspseudovisitedbackgroundcoloroninputhtmlfromrev192389trunkLayoutTestsfastcsspseudovisitedbackgroundcoloroninputhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46.60-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input.html (from rev 192389, trunk/LayoutTests/fast/css/pseudo-visited-background-color-on-input.html) (0 => 193706)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46.60-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input.html                                (rev 0)
+++ branches/safari-601.1.46.60-branch/LayoutTests/fast/css/pseudo-visited-background-color-on-input.html        2015-12-08 07:51:59 UTC (rev 193706)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+&lt;!DOCTYPE HTML&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;This tests that we draw the input natively when :visited background-color is set.&lt;/title&gt;
+&lt;style&gt;
+        a:visited input {
+                background-color: red;
+        }
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;button&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;submit&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;checkbox&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;file&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;checkbox&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;color&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;file&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;hidden&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;image&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;radio&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;range&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;reset&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;a href=&quot;&quot;&gt;&lt;input type=&quot;search&quot;&gt;&lt;/input&gt;&lt;/a&gt;&lt;br&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="branchessafari60114660branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46.60-branch/Source/WebCore/ChangeLog (193705 => 193706)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46.60-branch/Source/WebCore/ChangeLog        2015-12-08 07:50:20 UTC (rev 193705)
+++ branches/safari-601.1.46.60-branch/Source/WebCore/ChangeLog        2015-12-08 07:51:59 UTC (rev 193706)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-12-07  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r192389.
+
+    2015-11-12  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+            Ignore visited background color when deciding if the input renderer needs to be painted natively.
+            https://bugs.webkit.org/show_bug.cgi?id=151211
+            rdar://problem/21449823
+
+            Reviewed by Antti Koivisto.
+
+            Test: fast/css/pseudo-visited-background-color-on-input.html
+
+            * rendering/RenderTheme.cpp:
+            (WebCore::RenderTheme::isControlStyled):
+            * rendering/style/RenderStyle.h:
+
+2015-12-07  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
</ins><span class="cx">         Merge r192369.
</span><span class="cx"> 
</span><span class="cx">     2015-11-11  Jon Honeycutt  &lt;jhoneycutt@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari60114660branchSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46.60-branch/Source/WebCore/rendering/RenderTheme.cpp (193705 => 193706)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46.60-branch/Source/WebCore/rendering/RenderTheme.cpp        2015-12-08 07:50:20 UTC (rev 193705)
+++ branches/safari-601.1.46.60-branch/Source/WebCore/rendering/RenderTheme.cpp        2015-12-08 07:51:59 UTC (rev 193706)
</span><span class="lines">@@ -703,7 +703,7 @@
</span><span class="cx">         // Test the style to see if the UA border and background match.
</span><span class="cx">         return (style.border() != border
</span><span class="cx">             || *style.backgroundLayers() != background
</span><del>-            || style.visitedDependentColor(CSSPropertyBackgroundColor) != backgroundColor);
</del><ins>+            || !style.backgroundColorEqualsToColorIgnoringVisited(backgroundColor));
</ins><span class="cx">     default:
</span><span class="cx">         return false;
</span><span class="cx">     }
</span></span></pre></div>
<a id="branchessafari60114660branchSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46.60-branch/Source/WebCore/rendering/style/RenderStyle.h (193705 => 193706)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46.60-branch/Source/WebCore/rendering/style/RenderStyle.h        2015-12-08 07:50:20 UTC (rev 193705)
+++ branches/safari-601.1.46.60-branch/Source/WebCore/rendering/style/RenderStyle.h        2015-12-08 07:51:59 UTC (rev 193706)
</span><span class="lines">@@ -1843,6 +1843,7 @@
</span><span class="cx">     void setLastChildState() { setUnique(); noninherited_flags.setLastChildState(true); }
</span><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT Color visitedDependentColor(int colorProperty) const;
</span><ins>+    bool backgroundColorEqualsToColorIgnoringVisited(const Color&amp; color) const { return color == backgroundColor(); }
</ins><span class="cx"> 
</span><span class="cx">     void setHasExplicitlyInheritedProperties() { noninherited_flags.setHasExplicitlyInheritedProperties(true); }
</span><span class="cx">     bool hasExplicitlyInheritedProperties() const { return noninherited_flags.hasExplicitlyInheritedProperties(); }
</span></span></pre>
</div>
</div>

</body>
</html>