<!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>[174283] 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/174283">174283</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-10-03 13:27:28 -0700 (Fri, 03 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkit-appearance: default-button styling does not set the button font color to white
https://bugs.webkit.org/show_bug.cgi?id=137399
rdar://problem/17788616
Reviewed by Dave Hyatt.
When a button is styled with -webkit-appearance: default-button, it should
use the CSSValueActivebuttontext value for its text color when the window
is active, and the normal value when the window is inactive.
Since activating (focus/blur) windows doesn't cause a style recalculation, this
is applied as a paint-time operation. However, the render tree children that
paint the text don't know that they are contained within a RenderButton
and that the button is a default type. So I added an inherited flag, similar
to what we use for visited links, to remember if we're in a button. And then
computeTextPaintStyle chooses the correct value.
We can't test this because our LayoutTest system doesn't have
an active window, and thus the default button renders like a normal
button. This should cause no regressions though. Also, the appearance is
protected behind an SPI (or Setting), so this is not exposed to the Web.
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::adjustStyle): Set the flag if we're inside a default button.
* rendering/TextPaintStyle.cpp:
(WebCore::computeTextPaintStyle): If we're in a default button inside an active window,
use the CSSValueActivebuttontext color.
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::RenderStyle): Add and expose the new inherited flag: ._insideDefaultButton.
(WebCore::RenderStyle::changeRequiresRepaint): Ditto.
* rendering/style/RenderStyle.h: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemecpp">trunk/Source/WebCore/rendering/RenderTheme.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintStylecpp">trunk/Source/WebCore/rendering/TextPaintStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174282 => 174283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-03 20:26:41 UTC (rev 174282)
+++ trunk/Source/WebCore/ChangeLog 2014-10-03 20:27:28 UTC (rev 174283)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-10-03 Dean Jackson <dino@apple.com>
+
+ webkit-appearance: default-button styling does not set the button font color to white
+ https://bugs.webkit.org/show_bug.cgi?id=137399
+ rdar://problem/17788616
+
+ Reviewed by Dave Hyatt.
+
+ When a button is styled with -webkit-appearance: default-button, it should
+ use the CSSValueActivebuttontext value for its text color when the window
+ is active, and the normal value when the window is inactive.
+
+ Since activating (focus/blur) windows doesn't cause a style recalculation, this
+ is applied as a paint-time operation. However, the render tree children that
+ paint the text don't know that they are contained within a RenderButton
+ and that the button is a default type. So I added an inherited flag, similar
+ to what we use for visited links, to remember if we're in a button. And then
+ computeTextPaintStyle chooses the correct value.
+
+ We can't test this because our LayoutTest system doesn't have
+ an active window, and thus the default button renders like a normal
+ button. This should cause no regressions though. Also, the appearance is
+ protected behind an SPI (or Setting), so this is not exposed to the Web.
+
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::adjustStyle): Set the flag if we're inside a default button.
+ * rendering/TextPaintStyle.cpp:
+ (WebCore::computeTextPaintStyle): If we're in a default button inside an active window,
+ use the CSSValueActivebuttontext color.
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::RenderStyle): Add and expose the new inherited flag: ._insideDefaultButton.
+ (WebCore::RenderStyle::changeRequiresRepaint): Ditto.
+ * rendering/style/RenderStyle.h: Ditto.
+
</ins><span class="cx"> 2014-09-28 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [SVG -> OTF Converter] Support non-BMP codepoints
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (174282 => 174283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2014-10-03 20:26:41 UTC (rev 174282)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2014-10-03 20:27:28 UTC (rev 174283)
</span><span class="lines">@@ -177,6 +177,8 @@
</span><span class="cx"> if (style.setFontDescription(controlFont))
</span><span class="cx"> style.font().update(0);
</span><span class="cx"> }
</span><ins>+
+ style.setInsideDefaultButton(part == DefaultButtonPart);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> default:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPaintStyle.cpp (174282 => 174283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPaintStyle.cpp 2014-10-03 20:26:41 UTC (rev 174282)
+++ trunk/Source/WebCore/rendering/TextPaintStyle.cpp 2014-10-03 20:27:28 UTC (rev 174283)
</span><span class="lines">@@ -26,11 +26,14 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TextPaintStyle.h"
</span><span class="cx">
</span><ins>+#include "FocusController.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><ins>+#include "Page.h"
</ins><span class="cx"> #include "PaintInfo.h"
</span><span class="cx"> #include "RenderStyle.h"
</span><span class="cx"> #include "RenderText.h"
</span><ins>+#include "RenderTheme.h"
</ins><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx">
</span><span class="lines">@@ -86,6 +89,15 @@
</span><span class="cx"> paintStyle.emphasisMarkColor = paintInfo.forcedTextColor();
</span><span class="cx"> return paintStyle;
</span><span class="cx"> }
</span><ins>+
+ if (lineStyle.insideDefaultButton()) {
+ Page* page = renderer.frame().page();
+ if (page && page->focusController().isActive()) {
+ paintStyle.fillColor = renderer.theme().systemColor(CSSValueActivebuttontext);
+ return paintStyle;
+ }
+ }
+
</ins><span class="cx"> paintStyle.fillColor = lineStyle.visitedDependentColor(CSSPropertyWebkitTextFillColor);
</span><span class="cx">
</span><span class="cx"> bool forceBackgroundToWhite = false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (174282 => 174283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-10-03 20:26:41 UTC (rev 174282)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-10-03 20:27:28 UTC (rev 174283)
</span><span class="lines">@@ -149,6 +149,7 @@
</span><span class="cx"> inherited_flags.m_printColorAdjust = initialPrintColorAdjust();
</span><span class="cx"> inherited_flags._pointerEvents = initialPointerEvents();
</span><span class="cx"> inherited_flags._insideLink = NotInsideLink;
</span><ins>+ inherited_flags._insideDefaultButton = false;
</ins><span class="cx"> inherited_flags.m_writingMode = initialWritingMode();
</span><span class="cx">
</span><span class="cx"> static_assert((sizeof(InheritedFlags) <= 8), "InheritedFlags does not grow");
</span><span class="lines">@@ -714,6 +715,7 @@
</span><span class="cx"> if (inherited_flags._visibility != other->inherited_flags._visibility
</span><span class="cx"> || inherited_flags.m_printColorAdjust != other->inherited_flags.m_printColorAdjust
</span><span class="cx"> || inherited_flags._insideLink != other->inherited_flags._insideLink
</span><ins>+ || inherited_flags._insideDefaultButton != other->inherited_flags._insideDefaultButton
</ins><span class="cx"> || surround->border != other->surround->border
</span><span class="cx"> || !m_background->isEquivalentForPainting(*other->m_background)
</span><span class="cx"> || rareInheritedData->userModify != other->rareInheritedData->userModify
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (174282 => 174283)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-10-03 20:26:41 UTC (rev 174282)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-10-03 20:27:28 UTC (rev 174283)
</span><span class="lines">@@ -436,6 +436,7 @@
</span><span class="cx"> && (m_printColorAdjust == other.m_printColorAdjust)
</span><span class="cx"> && (_pointerEvents == other._pointerEvents)
</span><span class="cx"> && (_insideLink == other._insideLink)
</span><ins>+ && (_insideDefaultButton == other._insideDefaultButton)
</ins><span class="cx"> && (m_writingMode == other.m_writingMode);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -464,11 +465,12 @@
</span><span class="cx"> unsigned m_printColorAdjust : PrintColorAdjustBits;
</span><span class="cx"> unsigned _pointerEvents : 4; // EPointerEvents
</span><span class="cx"> unsigned _insideLink : 2; // EInsideLink
</span><del>- // 43 bits
</del><ins>+ unsigned _insideDefaultButton : 1;
+ // 44 bits
</ins><span class="cx">
</span><span class="cx"> // CSS Text Layout Module Level 3: Vertical writing support
</span><span class="cx"> unsigned m_writingMode : 2; // WritingMode
</span><del>- // 45 bits
</del><ins>+ // 46 bits
</ins><span class="cx"> } inherited_flags;
</span><span class="cx">
</span><span class="cx"> // don't inherit
</span><span class="lines">@@ -855,6 +857,8 @@
</span><span class="cx"> EInsideLink insideLink() const { return static_cast<EInsideLink>(inherited_flags._insideLink); }
</span><span class="cx"> bool isLink() const { return noninherited_flags.isLink(); }
</span><span class="cx">
</span><ins>+ bool insideDefaultButton() const { return inherited_flags._insideDefaultButton; }
+
</ins><span class="cx"> short widows() const { return rareInheritedData->widows; }
</span><span class="cx"> short orphans() const { return rareInheritedData->orphans; }
</span><span class="cx"> bool hasAutoWidows() const { return rareInheritedData->m_hasAutoWidows; }
</span><span class="lines">@@ -1415,6 +1419,8 @@
</span><span class="cx"> void setInsideLink(EInsideLink insideLink) { inherited_flags._insideLink = insideLink; }
</span><span class="cx"> void setIsLink(bool b) { noninherited_flags.setIsLink(b); }
</span><span class="cx">
</span><ins>+ void setInsideDefaultButton(bool insideDefaultButton) { inherited_flags._insideDefaultButton = insideDefaultButton; }
+
</ins><span class="cx"> PrintColorAdjust printColorAdjust() const { return static_cast<PrintColorAdjust>(inherited_flags.m_printColorAdjust); }
</span><span class="cx"> void setPrintColorAdjust(PrintColorAdjust value) { inherited_flags.m_printColorAdjust = value; }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>