<!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>[198983] 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/198983">198983</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-03 03:50:11 -0700 (Sun, 03 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace all RenderTheme::popupInternalPadding methods with a single one returning a LengthBox
https://bugs.webkit.org/show_bug.cgi?id=156098
Reviewed by Darin Adler.
The caller always wants all padding sides, so we can simplify both the caller and the implementations by using a
single method. It's also more efficient for the GTK+ port that creates and destroys the same style contexts on
every call.
* rendering/RenderMenuList.cpp:
(WebCore::RenderMenuList::adjustInnerStyle):
* rendering/RenderTheme.h:
(WebCore::RenderTheme::popupInternalPaddingBox):
(WebCore::RenderTheme::popupInternalPaddingLeft): Deleted.
(WebCore::RenderTheme::popupInternalPaddingRight): Deleted.
(WebCore::RenderTheme::popupInternalPaddingTop): Deleted.
(WebCore::RenderTheme::popupInternalPaddingBottom): Deleted.
* rendering/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::popupInternalPaddingBox):
(WebCore::getComboBoxMetrics): Deleted.
(WebCore::RenderThemeGtk::popupInternalPaddingLeft): Deleted.
(WebCore::RenderThemeGtk::popupInternalPaddingRight): Deleted.
(WebCore::RenderThemeGtk::popupInternalPaddingTop): Deleted.
(WebCore::RenderThemeGtk::popupInternalPaddingBottom): Deleted.
* rendering/RenderThemeGtk.h:
* rendering/RenderThemeIOS.h:
* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::popupInternalPaddingBox):
(WebCore::RenderThemeIOS::popupInternalPaddingRight): Deleted.
* rendering/RenderThemeMac.h:
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::popupInternalPaddingBox):
(WebCore::RenderThemeMac::popupInternalPaddingLeft): Deleted.
(WebCore::RenderThemeMac::popupInternalPaddingRight): Deleted.
(WebCore::RenderThemeMac::popupInternalPaddingTop): Deleted.
(WebCore::RenderThemeMac::popupInternalPaddingBottom): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListcpp">trunk/Source/WebCore/rendering/RenderMenuList.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeh">trunk/Source/WebCore/rendering/RenderTheme.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeGtkcpp">trunk/Source/WebCore/rendering/RenderThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeGtkh">trunk/Source/WebCore/rendering/RenderThemeGtk.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSh">trunk/Source/WebCore/rendering/RenderThemeIOS.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMach">trunk/Source/WebCore/rendering/RenderThemeMac.h</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 (198982 => 198983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-03 09:56:44 UTC (rev 198982)
+++ trunk/Source/WebCore/ChangeLog 2016-04-03 10:50:11 UTC (rev 198983)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2016-04-03 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ Replace all RenderTheme::popupInternalPadding methods with a single one returning a LengthBox
+ https://bugs.webkit.org/show_bug.cgi?id=156098
+
+ Reviewed by Darin Adler.
+
+ The caller always wants all padding sides, so we can simplify both the caller and the implementations by using a
+ single method. It's also more efficient for the GTK+ port that creates and destroys the same style contexts on
+ every call.
+
+ * rendering/RenderMenuList.cpp:
+ (WebCore::RenderMenuList::adjustInnerStyle):
+ * rendering/RenderTheme.h:
+ (WebCore::RenderTheme::popupInternalPaddingBox):
+ (WebCore::RenderTheme::popupInternalPaddingLeft): Deleted.
+ (WebCore::RenderTheme::popupInternalPaddingRight): Deleted.
+ (WebCore::RenderTheme::popupInternalPaddingTop): Deleted.
+ (WebCore::RenderTheme::popupInternalPaddingBottom): Deleted.
+ * rendering/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::popupInternalPaddingBox):
+ (WebCore::getComboBoxMetrics): Deleted.
+ (WebCore::RenderThemeGtk::popupInternalPaddingLeft): Deleted.
+ (WebCore::RenderThemeGtk::popupInternalPaddingRight): Deleted.
+ (WebCore::RenderThemeGtk::popupInternalPaddingTop): Deleted.
+ (WebCore::RenderThemeGtk::popupInternalPaddingBottom): Deleted.
+ * rendering/RenderThemeGtk.h:
+ * rendering/RenderThemeIOS.h:
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::RenderThemeIOS::popupInternalPaddingBox):
+ (WebCore::RenderThemeIOS::popupInternalPaddingRight): Deleted.
+ * rendering/RenderThemeMac.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::popupInternalPaddingBox):
+ (WebCore::RenderThemeMac::popupInternalPaddingLeft): Deleted.
+ (WebCore::RenderThemeMac::popupInternalPaddingRight): Deleted.
+ (WebCore::RenderThemeMac::popupInternalPaddingTop): Deleted.
+ (WebCore::RenderThemeMac::popupInternalPaddingBottom): Deleted.
+
</ins><span class="cx"> 2016-04-02 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Cleanup DataDetection.mm a little bit
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (198982 => 198983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2016-04-03 09:56:44 UTC (rev 198982)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2016-04-03 10:50:11 UTC (rev 198983)
</span><span class="lines">@@ -123,10 +123,7 @@
</span><span class="cx"> innerStyle.setAlignSelfPosition(ItemPositionFlexStart);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- innerStyle.setPaddingLeft(Length(theme().popupInternalPaddingLeft(style()), Fixed));
- innerStyle.setPaddingRight(Length(theme().popupInternalPaddingRight(style()), Fixed));
- innerStyle.setPaddingTop(Length(theme().popupInternalPaddingTop(style()), Fixed));
- innerStyle.setPaddingBottom(Length(theme().popupInternalPaddingBottom(style()), Fixed));
</del><ins>+ innerStyle.setPaddingBox(theme().popupInternalPaddingBox(style()));
</ins><span class="cx">
</span><span class="cx"> if (document().page()->chrome().selectItemWritingDirectionIsNatural()) {
</span><span class="cx"> // Items in the popup will not respect the CSS text-align and direction properties,
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.h (198982 => 198983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.h 2016-04-03 09:56:44 UTC (rev 198982)
+++ trunk/Source/WebCore/rendering/RenderTheme.h 2016-04-03 10:50:11 UTC (rev 198983)
</span><span class="lines">@@ -184,10 +184,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void adjustSliderThumbSize(RenderStyle&, Element*) const;
</span><span class="cx">
</span><del>- virtual int popupInternalPaddingLeft(const RenderStyle&) const { return 0; }
- virtual int popupInternalPaddingRight(const RenderStyle&) const { return 0; }
- virtual int popupInternalPaddingTop(const RenderStyle&) const { return 0; }
- virtual int popupInternalPaddingBottom(const RenderStyle&) const { return 0; }
</del><ins>+ virtual LengthBox popupInternalPaddingBox(const RenderStyle&) const { return { 0, 0, 0, 0 }; }
</ins><span class="cx"> virtual bool popupOptionSupportsTextIndent() const { return false; }
</span><span class="cx"> virtual PopupMenuStyle::PopupMenuSize popupMenuSize(const RenderStyle&, IntRect&) const { return PopupMenuStyle::PopupMenuSizeNormal; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (198982 => 198983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-04-03 09:56:44 UTC (rev 198982)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-04-03 10:50:11 UTC (rev 198983)
</span><span class="lines">@@ -761,63 +761,27 @@
</span><span class="cx"> adjustMenuListStyle(styleResolver, style, e);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void getComboBoxMetrics(const RenderStyle& style, GtkBorder& border, int& focus)
</del><ins>+LengthBox RenderThemeGtk::popupInternalPaddingBox(const RenderStyle& style) const
</ins><span class="cx"> {
</span><del>- // If this menu list button isn't drawn using the native theme, we
- // don't add any extra padding beyond what WebCore already uses.
</del><span class="cx"> if (style.appearance() == NoControlPart)
</span><del>- return;
</del><ins>+ return { 0, 0, 0, 0 };
</ins><span class="cx">
</span><span class="cx"> GRefPtr<GtkStyleContext> parentContext = createStyleContext(ComboBox);
</span><span class="cx"> GRefPtr<GtkStyleContext> context = createStyleContext(ComboBoxButton, parentContext.get());
</span><span class="cx"> gtk_style_context_set_direction(context.get(), static_cast<GtkTextDirection>(gtkTextDirection(style.direction())));
</span><span class="cx"> gtk_style_context_set_state(context.get(), static_cast<GtkStateFlags>(0));
</span><del>- gtk_style_context_get_border(context.get(), gtk_style_context_get_state(context.get()), &border);
</del><ins>+ GtkBorder borderWidth = { 0, 0, 0, 0 };
+ gtk_style_context_get_border(context.get(), gtk_style_context_get_state(context.get()), &borderWidth);
</ins><span class="cx">
</span><span class="cx"> gboolean interiorFocus;
</span><span class="cx"> gint focusWidth, focusPad;
</span><span class="cx"> gtk_style_context_get_style(context.get(), "interior-focus", &interiorFocus, "focus-line-width", &focusWidth, "focus-padding", &focusPad, nullptr);
</span><del>- focus = interiorFocus ? focusWidth + focusPad : 0;
-}
</del><ins>+ focusWidth = interiorFocus ? focusWidth + focusPad : 0;
</ins><span class="cx">
</span><del>-int RenderThemeGtk::popupInternalPaddingLeft(const RenderStyle& style) const
-{
- GtkBorder borderWidth = { 0, 0, 0, 0 };
- int focusWidth = 0;
- getComboBoxMetrics(style, borderWidth, focusWidth);
- int left = borderWidth.left + focusWidth;
- if (style.direction() == RTL)
- left += minArrowSize;
- return left;
</del><ins>+ return { borderWidth.top + focusWidth, borderWidth.right + focusWidth + (style.direction() == LTR ? minArrowSize : 0),
+ borderWidth.bottom + focusWidth, borderWidth.left + focusWidth + (style.direction() == RTL ? minArrowSize : 0) };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderThemeGtk::popupInternalPaddingRight(const RenderStyle& style) const
-{
- GtkBorder borderWidth = { 0, 0, 0, 0 };
- int focusWidth = 0;
- getComboBoxMetrics(style, borderWidth, focusWidth);
- int right = borderWidth.right + focusWidth;
- if (style.direction() == LTR)
- right += minArrowSize;
- return right;
-}
-
-int RenderThemeGtk::popupInternalPaddingTop(const RenderStyle& style) const
-{
- GtkBorder borderWidth = { 0, 0, 0, 0 };
- int focusWidth = 0;
- getComboBoxMetrics(style, borderWidth, focusWidth);
- return borderWidth.top + focusWidth;
-}
-
-int RenderThemeGtk::popupInternalPaddingBottom(const RenderStyle& style) const
-{
- GtkBorder borderWidth = { 0, 0, 0, 0 };
- int focusWidth = 0;
- getComboBoxMetrics(style, borderWidth, focusWidth);
- return borderWidth.bottom + focusWidth;
-}
-
</del><span class="cx"> bool RenderThemeGtk::paintMenuList(const RenderObject& renderObject, const PaintInfo& paintInfo, const FloatRect& r)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: adopt subpixel themes.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.h (198982 => 198983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.h 2016-04-03 09:56:44 UTC (rev 198982)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.h 2016-04-03 10:50:11 UTC (rev 198983)
</span><span class="lines">@@ -119,10 +119,7 @@
</span><span class="cx"> bool paintTextField(const RenderObject&, const PaintInfo&, const FloatRect&) override;
</span><span class="cx"> bool paintTextArea(const RenderObject&, const PaintInfo&, const FloatRect&) override;
</span><span class="cx">
</span><del>- int popupInternalPaddingLeft(const RenderStyle&) const override;
- int popupInternalPaddingRight(const RenderStyle&) const override;
- int popupInternalPaddingTop(const RenderStyle&) const override;
- int popupInternalPaddingBottom(const RenderStyle&) const override;
</del><ins>+ LengthBox popupInternalPaddingBox(const RenderStyle&) const override;
</ins><span class="cx">
</span><span class="cx"> // The Mac port differentiates between the "menu list" and the "menu list button."
</span><span class="cx"> // The former is used when a menu list button has been styled. This is used to ensure
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.h (198982 => 198983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.h 2016-04-03 09:56:44 UTC (rev 198982)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.h 2016-04-03 10:50:11 UTC (rev 198983)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<RenderTheme> create();
</span><span class="cx">
</span><del>- int popupInternalPaddingRight(const RenderStyle&) const override;
</del><ins>+ LengthBox popupInternalPaddingBox(const RenderStyle&) const override;
</ins><span class="cx">
</span><span class="cx"> static void adjustRoundBorderRadius(RenderStyle&, RenderBox&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (198982 => 198983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-04-03 09:56:44 UTC (rev 198982)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-04-03 10:50:11 UTC (rev 198983)
</span><span class="lines">@@ -528,11 +528,11 @@
</span><span class="cx"> const float MenuListArrowHeight = 6;
</span><span class="cx"> const float MenuListButtonPaddingRight = 19;
</span><span class="cx">
</span><del>-int RenderThemeIOS::popupInternalPaddingRight(const RenderStyle& style) const
</del><ins>+LengthBox RenderThemeIOS::popupInternalPaddingBox(const RenderStyle& style) const
</ins><span class="cx"> {
</span><span class="cx"> if (style.appearance() == MenulistButtonPart)
</span><del>- return MenuListButtonPaddingRight + style.borderTopWidth();
- return 0;
</del><ins>+ return { 0, static_cast<int>(MenuListButtonPaddingRight + style.borderTopWidth()), 0, 0 };
+ return { 0, 0, 0, 0 };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderThemeIOS::adjustRoundBorderRadius(RenderStyle& style, RenderBox& box)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (198982 => 198983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.h 2016-04-03 09:56:44 UTC (rev 198982)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h 2016-04-03 10:50:11 UTC (rev 198983)
</span><span class="lines">@@ -75,10 +75,7 @@
</span><span class="cx"> int sliderTickOffsetFromTrackCenter() const override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- int popupInternalPaddingLeft(const RenderStyle&) const override;
- int popupInternalPaddingRight(const RenderStyle&) const override;
- int popupInternalPaddingTop(const RenderStyle&) const override;
- int popupInternalPaddingBottom(const RenderStyle&) const override;
</del><ins>+ LengthBox popupInternalPaddingBox(const RenderStyle&) const override;
</ins><span class="cx"> PopupMenuStyle::PopupMenuSize popupMenuSize(const RenderStyle&, IntRect&) const override;
</span><span class="cx">
</span><span class="cx"> bool popsMenuByArrowKeys() const override { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (198982 => 198983)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-04-03 09:56:44 UTC (rev 198982)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2016-04-03 10:50:11 UTC (rev 198983)
</span><span class="lines">@@ -1365,45 +1365,25 @@
</span><span class="cx"> style.setBoxShadow(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderThemeMac::popupInternalPaddingLeft(const RenderStyle& style) const
</del><ins>+LengthBox RenderThemeMac::popupInternalPaddingBox(const RenderStyle& style) const
</ins><span class="cx"> {
</span><del>- if (style.appearance() == MenulistPart)
- return popupButtonPadding(controlSizeForFont(style))[leftPadding] * style.effectiveZoom();
- if (style.appearance() == MenulistButtonPart)
- return styledPopupPaddingLeft * style.effectiveZoom();
- return 0;
-}
</del><ins>+ if (style.appearance() == MenulistPart) {
+ return { static_cast<int>(popupButtonPadding(controlSizeForFont(style))[topPadding] * style.effectiveZoom()),
+ static_cast<int>(popupButtonPadding(controlSizeForFont(style))[rightPadding] * style.effectiveZoom()),
+ static_cast<int>(popupButtonPadding(controlSizeForFont(style))[bottomPadding] * style.effectiveZoom()),
+ static_cast<int>(popupButtonPadding(controlSizeForFont(style))[leftPadding] * style.effectiveZoom()) };
+ }
</ins><span class="cx">
</span><del>-int RenderThemeMac::popupInternalPaddingRight(const RenderStyle& style) const
-{
- if (style.appearance() == MenulistPart)
- return popupButtonPadding(controlSizeForFont(style))[rightPadding] * style.effectiveZoom();
</del><span class="cx"> if (style.appearance() == MenulistButtonPart) {
</span><del>- float fontScale = style.fontSize() / baseFontSize;
- float arrowWidth = baseArrowWidth * fontScale;
- return static_cast<int>(ceilf(arrowWidth + (arrowPaddingLeft + arrowPaddingRight + paddingBeforeSeparator) * style.effectiveZoom()));
</del><ins>+ float arrowWidth = baseArrowWidth * (style.fontSize() / baseFontSize);
+ return { static_cast<int>(styledPopupPaddingTop * style.effectiveZoom()),
+ static_cast<int>(ceilf(arrowWidth + (arrowPaddingLeft + arrowPaddingRight + paddingBeforeSeparator) * style.effectiveZoom())),
+ static_cast<int>(styledPopupPaddingBottom * style.effectiveZoom()), static_cast<int>(styledPopupPaddingLeft * style.effectiveZoom()) };
</ins><span class="cx"> }
</span><del>- return 0;
-}
</del><span class="cx">
</span><del>-int RenderThemeMac::popupInternalPaddingTop(const RenderStyle& style) const
-{
- if (style.appearance() == MenulistPart)
- return popupButtonPadding(controlSizeForFont(style))[topPadding] * style.effectiveZoom();
- if (style.appearance() == MenulistButtonPart)
- return styledPopupPaddingTop * style.effectiveZoom();
- return 0;
</del><ins>+ return { 0, 0, 0, 0 };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderThemeMac::popupInternalPaddingBottom(const RenderStyle& style) const
-{
- if (style.appearance() == MenulistPart)
- return popupButtonPadding(controlSizeForFont(style))[bottomPadding] * style.effectiveZoom();
- if (style.appearance() == MenulistButtonPart)
- return styledPopupPaddingBottom * style.effectiveZoom();
- return 0;
-}
-
</del><span class="cx"> PopupMenuStyle::PopupMenuSize RenderThemeMac::popupMenuSize(const RenderStyle& style, IntRect& rect) const
</span><span class="cx"> {
</span><span class="cx"> NSPopUpButtonCell* popupButton = this->popupButton();
</span></span></pre>
</div>
</div>
</body>
</html>