<!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>[173928] trunk/Source/WebCore</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/173928">173928</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-09-24 12:57:12 -0700 (Wed, 24 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Yosemite] Button text doesn't go white while pushing the button, like it does for real buttons
https://bugs.webkit.org/show_bug.cgi?id=137054
rdar://problem/17559038
Reviewed by NOBODY (OOPS!).
On Yosemite and above, system buttons paint with white-ish text when they
are pressed. Since this isn't exposed by API, I've hardcoded the value
into RenderThemeMac.
The actual state is exposed by adding a :active rule to html.css that
uses a new CSSValueKeyword: ActiveButtonText.
Unfortunately I can't find a way to test this, because the active state isn't
testable. We should really expose the Inspector's forcePseudoState function into
window.internals.
* css/CSSValueKeywords.in: Add "activebuttontext".
* css/html.css:
(input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active, input[type="file"]::-webkit-file-upload-button:active, button:active): New rule for active
button elements.
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::systemColor): Handle CSSValueActivebuttontext as black.
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::systemColor): Handle CSSValueActivebuttontext as
white with 75% opacity.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecsshtmlcss">trunk/Source/WebCore/css/html.css</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemecpp">trunk/Source/WebCore/rendering/RenderTheme.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173927 => 173928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-24 19:52:14 UTC (rev 173927)
+++ trunk/Source/WebCore/ChangeLog 2014-09-24 19:57:12 UTC (rev 173928)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-09-23 Dean Jackson <dino@apple.com>
+
+ [Yosemite] Button text doesn't go white while pushing the button, like it does for real buttons
+ https://bugs.webkit.org/show_bug.cgi?id=137054
+ rdar://problem/17559038
+
+ Reviewed by Sam Weinig.
+
+ On Yosemite and above, system buttons paint with white-ish text when they
+ are pressed. Since this isn't exposed by API, I've hardcoded the value
+ into RenderThemeMac.
+
+ The actual state is exposed by adding a :active rule to html.css that
+ uses a new CSSValueKeyword: ActiveButtonText.
+
+ Unfortunately I can't find a way to test this, because the active state isn't
+ testable. We should really expose the Inspector's forcePseudoState function into
+ window.internals.
+
+ * css/CSSValueKeywords.in: Add "activebuttontext".
+ * css/html.css:
+ (input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active, input[type="file"]::-webkit-file-upload-button:active, button:active): New rule for active
+ button elements.
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::systemColor): Handle CSSValueActivebuttontext as black.
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::systemColor): Handle CSSValueActivebuttontext as
+ white with 75% opacity.
+
</ins><span class="cx"> 2014-09-24 Christophe Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Use is<SVG*Element>() instead of isSVG*Element()
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (173927 => 173928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2014-09-24 19:52:14 UTC (rev 173927)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2014-09-24 19:57:12 UTC (rev 173928)
</span><span class="lines">@@ -162,6 +162,7 @@
</span><span class="cx"> buttonhighlight
</span><span class="cx"> buttonshadow
</span><span class="cx"> buttontext
</span><ins>+activebuttontext
</ins><span class="cx"> captiontext
</span><span class="cx"> graytext
</span><span class="cx"> highlight
</span></span></pre></div>
<a id="trunkSourceWebCorecsshtmlcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/html.css (173927 => 173928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/html.css 2014-09-24 19:52:14 UTC (rev 173927)
+++ trunk/Source/WebCore/css/html.css 2014-09-24 19:57:12 UTC (rev 173928)
</span><span class="lines">@@ -690,6 +690,10 @@
</span><span class="cx"> box-sizing: border-box
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+input[type="button"]:active, input[type="submit"]:active, input[type="reset"]:active, input[type="file"]::-webkit-file-upload-button:active, button:active {
+ color: ActiveButtonText;
+}
+
</ins><span class="cx"> input[type="range"] {
</span><span class="cx"> -webkit-appearance: slider-horizontal;
</span><span class="cx"> padding: initial;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (173927 => 173928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2014-09-24 19:52:14 UTC (rev 173927)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2014-09-24 19:57:12 UTC (rev 173928)
</span><span class="lines">@@ -1152,6 +1152,8 @@
</span><span class="cx"> return 0xFF888888;
</span><span class="cx"> case CSSValueButtontext:
</span><span class="cx"> return 0xFF000000;
</span><ins>+ case CSSValueActivebuttontext:
+ return 0xFF000000;
</ins><span class="cx"> case CSSValueCaptiontext:
</span><span class="cx"> return 0xFF000000;
</span><span class="cx"> case CSSValueGraytext:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (173927 => 173928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-09-24 19:52:14 UTC (rev 173927)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2014-09-24 19:57:12 UTC (rev 173928)
</span><span class="lines">@@ -516,6 +516,11 @@
</span><span class="cx"> case CSSValueButtontext:
</span><span class="cx"> color = convertNSColorToColor([NSColor controlTextColor]);
</span><span class="cx"> break;
</span><ins>+ case CSSValueActivebuttontext:
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+ color = 0xC0FFFFFF;
+#endif
+ break;
</ins><span class="cx"> case CSSValueCaptiontext:
</span><span class="cx"> color = convertNSColorToColor([NSColor textColor]);
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>