<!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>[183366] trunk</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/183366">183366</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-04-26 14:25:02 -0700 (Sun, 26 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/176751">r176751</a>): line-height ignored in <button> elements
https://bugs.webkit.org/show_bug.cgi?id=144234
Reviewed by Antti Koivisto.
Source/WebCore:
Test: fast/forms/button-line-height.html
* platform/Theme.h: Changed controlFont to return an Optional so we can tell
when the theme is overriding the font. Otherwise if the font from the user-agent
style sheet and the font from the theme are the same, we will think we are not
overriding the font when we actually are.
* platform/mac/ThemeMac.h: Updated controlFont to return Optional.
* platform/mac/ThemeMac.mm:
(WebCore::ThemeMac::controlFont): Ditto.
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::adjustStyle): Set line height only if the font is
overriden by the theme, all the time for PushButtonPart on Mac, and not at all
for other parts. Also tightened up the logic a little since RenderStyle's
setFontDescription already does an "==" comparison; we don't have to do
that twice.
LayoutTests:
* fast/forms/button-line-height-expected.html: Added.
* fast/forms/button-line-height.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformThemeh">trunk/Source/WebCore/platform/Theme.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacThemeMach">trunk/Source/WebCore/platform/mac/ThemeMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacThemeMacmm">trunk/Source/WebCore/platform/mac/ThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemecpp">trunk/Source/WebCore/rendering/RenderTheme.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastformsbuttonlineheightexpectedhtml">trunk/LayoutTests/fast/forms/button-line-height-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastformsbuttonlineheighthtml">trunk/LayoutTests/fast/forms/button-line-height.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183365 => 183366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-26 21:18:15 UTC (rev 183365)
+++ trunk/LayoutTests/ChangeLog 2015-04-26 21:25:02 UTC (rev 183366)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-04-26 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION (r176751): line-height ignored in <button> elements
+ https://bugs.webkit.org/show_bug.cgi?id=144234
+
+ Reviewed by Antti Koivisto.
+
+ * fast/forms/button-line-height-expected.html: Added.
+ * fast/forms/button-line-height.html: Added.
+
+2015-04-26 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> REGRESSION (r173801): Use after free in WebCore::NotificationCenter::~NotificationCenter
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137163
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastformsbuttonlineheightexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/button-line-height-expected.html (0 => 183366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/button-line-height-expected.html (rev 0)
+++ trunk/LayoutTests/fast/forms/button-line-height-expected.html 2015-04-26 21:25:02 UTC (rev 183366)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<button style="height:24px; margin:0">Button with line-height</button>
+<button style="height:24px; margin:0">Button with height</button>
+<button style="height:124px; margin:0">Button with line-height</button>
+<button style="height:124px; margin:0">Button with height</button>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/forms/button-line-height-expected.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastformsbuttonlineheighthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/forms/button-line-height.html (0 => 183366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/forms/button-line-height.html (rev 0)
+++ trunk/LayoutTests/fast/forms/button-line-height.html 2015-04-26 21:25:02 UTC (rev 183366)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<button style="line-height:19px; margin:0">Button with line-height</button>
+<button style="height:24px; margin:0">Button with height</button>
+<button style="line-height:119px; margin:0">Button with line-height</button>
+<button style="height:124px; margin:0">Button with height</button>
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/forms/button-line-height.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183365 => 183366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-26 21:18:15 UTC (rev 183365)
+++ trunk/Source/WebCore/ChangeLog 2015-04-26 21:25:02 UTC (rev 183366)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2015-04-26 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION (r176751): line-height ignored in <button> elements
+ https://bugs.webkit.org/show_bug.cgi?id=144234
+
+ Reviewed by Antti Koivisto.
+
+ Test: fast/forms/button-line-height.html
+
+ * platform/Theme.h: Changed controlFont to return an Optional so we can tell
+ when the theme is overriding the font. Otherwise if the font from the user-agent
+ style sheet and the font from the theme are the same, we will think we are not
+ overriding the font when we actually are.
+
+ * platform/mac/ThemeMac.h: Updated controlFont to return Optional.
+ * platform/mac/ThemeMac.mm:
+ (WebCore::ThemeMac::controlFont): Ditto.
+
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::adjustStyle): Set line height only if the font is
+ overriden by the theme, all the time for PushButtonPart on Mac, and not at all
+ for other parts. Also tightened up the logic a little since RenderStyle's
+ setFontDescription already does an "==" comparison; we don't have to do
+ that twice.
+
+2015-04-26 Darin Adler <darin@apple.com>
+
</ins><span class="cx"> REGRESSION (r173801): Use after free in WebCore::NotificationCenter::~NotificationCenter
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137163
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Theme.h (183365 => 183366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Theme.h 2015-04-26 21:18:15 UTC (rev 183365)
+++ trunk/Source/WebCore/platform/Theme.h 2015-04-26 21:25:02 UTC (rev 183366)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "LengthSize.h"
</span><span class="cx"> #include "ThemeTypes.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/Optional.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -82,9 +83,9 @@
</span><span class="cx"> // Methods used to adjust the RenderStyles of controls.
</span><span class="cx">
</span><span class="cx"> // The font description result should have a zoomed font size.
</span><del>- virtual FontDescription controlFont(ControlPart, const FontCascade& font, float /*zoomFactor*/) const { return font.fontDescription(); }
</del><ins>+ virtual Optional<FontDescription> controlFont(ControlPart, const FontCascade&, float /*zoomFactor*/) const { return Nullopt; }
</ins><span class="cx">
</span><del>- // The size here is in zoomed coordinates already. If a new size is returned, it also needs to be in zoomed coordinates.
</del><ins>+ // The size here is in zoomed coordinates already. If a new size is returned, it also needs to be in zoomed coordinates.
</ins><span class="cx"> virtual LengthSize controlSize(ControlPart, const FontCascade&, const LengthSize& zoomedSize, float /*zoomFactor*/) const { return zoomedSize; }
</span><span class="cx">
</span><span class="cx"> // Returns the minimum size for a control in zoomed coordinates.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.h (183365 => 183366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.h 2015-04-26 21:18:15 UTC (rev 183365)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.h 2015-04-26 21:25:02 UTC (rev 183366)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> virtual int baselinePositionAdjustment(ControlPart) const;
</span><span class="cx">
</span><del>- virtual FontDescription controlFont(ControlPart, const FontCascade&, float zoomFactor) const;
</del><ins>+ virtual Optional<FontDescription> controlFont(ControlPart, const FontCascade&, float zoomFactor) const;
</ins><span class="cx">
</span><span class="cx"> virtual LengthSize controlSize(ControlPart, const FontCascade&, const LengthSize&, float zoomFactor) const;
</span><span class="cx"> virtual LengthSize minimumControlSize(ControlPart, const FontCascade&, float zoomFactor) const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ThemeMac.mm (183365 => 183366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ThemeMac.mm 2015-04-26 21:18:15 UTC (rev 183365)
+++ trunk/Source/WebCore/platform/mac/ThemeMac.mm 2015-04-26 21:25:02 UTC (rev 183366)
</span><span class="lines">@@ -667,7 +667,7 @@
</span><span class="cx"> return Theme::baselinePositionAdjustment(part);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FontDescription ThemeMac::controlFont(ControlPart part, const FontCascade& font, float zoomFactor) const
</del><ins>+Optional<FontDescription> ThemeMac::controlFont(ControlPart part, const FontCascade& font, float zoomFactor) const
</ins><span class="cx"> {
</span><span class="cx"> switch (part) {
</span><span class="cx"> case PushButtonPart: {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (183365 => 183366)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-04-26 21:18:15 UTC (rev 183365)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-04-26 21:25:02 UTC (rev 183366)
</span><span class="lines">@@ -170,14 +170,12 @@
</span><span class="cx"> style.setMinHeight(minControlSize.height());
</span><span class="cx">
</span><span class="cx"> // Font
</span><del>- FontDescription controlFont = m_theme->controlFont(part, style.fontCascade(), style.effectiveZoom());
- if (controlFont != style.fontCascade().fontDescription()) {
- // Now update our font.
- if (style.setFontDescription(controlFont))
- style.fontCascade().update(0);
</del><ins>+ if (auto themeFont = m_theme->controlFont(part, style.fontCascade(), style.effectiveZoom())) {
+ // If overriding the specified font with the theme font, also override the line height with the standard line height.
+ style.setLineHeight(RenderStyle::initialLineHeight());
+ if (style.setFontDescription(themeFont.value()))
+ style.fontCascade().update(nullptr);
</ins><span class="cx"> }
</span><del>- // Reset our line-height
- style.setLineHeight(RenderStyle::initialLineHeight());
</del><span class="cx"> style.setInsideDefaultButton(part == DefaultButtonPart);
</span><span class="cx"> }
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>