<!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>[160113] 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/160113">160113</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-04 12:17:46 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename RenderTheme::paintMenuListButton()
https://bugs.webkit.org/show_bug.cgi?id=125193
Reviewed by Simon Fraser.
Towards upstreaming the iOS concept of render theme decorations we should rename
RenderTheme::paintMenuListButton() to RenderTheme::paintMenuListButtonDecorations()
to better describe its purpose.
Also, fix code style issues.
* platform/blackberry/RenderThemeBlackBerry.cpp:
(WebCore::RenderThemeBlackBerry::paintMenuListButtonDecorations):
* platform/blackberry/RenderThemeBlackBerry.h:
* platform/efl/RenderThemeEfl.cpp:
(WebCore::RenderThemeEfl::paintMenuListButtonDecorations):
* platform/efl/RenderThemeEfl.h:
* platform/gtk/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::paintMenuListButtonDecorations):
* platform/gtk/RenderThemeGtk.h:
* platform/nix/RenderThemeNix.h:
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::paintDecorations): Rename argument o, r to renderer and rect, respectively.
* rendering/RenderTheme.h:
(WebCore::RenderTheme::paintMenuListButtonDecorations):
* rendering/RenderThemeMac.h:
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintMenuListButtonDecorations): Rename argument o, r to renderer and rect,
respectively; also remove extraneous white space and substitute 1 for 1.0f.
* rendering/RenderThemeSafari.cpp:
(WebCore::RenderThemeSafari::paintMenuListButtonDecorations): Ditto.
* rendering/RenderThemeSafari.h:
* rendering/RenderThemeWin.cpp:
(WebCore::RenderThemeWin::paintMenuList): Rename argument o, i, r to renderer, paintInfo, and rect,
respectively.
(WebCore::RenderThemeWin::paintMenuListButtonDecorations): Ditto.
* rendering/RenderThemeWin.h:
* rendering/RenderThemeWinCE.cpp:
(WebCore::RenderThemeWinCE::paintMenuList): Ditto.
(WebCore::RenderThemeWinCE::paintMenuListButtonDecorations): Ditto.
* rendering/RenderThemeWinCE.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformblackberryRenderThemeBlackBerrycpp">trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformblackberryRenderThemeBlackBerryh">trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.h</a></li>
<li><a href="#trunkSourceWebCoreplatformeflRenderThemeEflcpp">trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformeflRenderThemeEflh">trunk/Source/WebCore/platform/efl/RenderThemeEfl.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGtkcpp">trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkRenderThemeGtkh">trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnixRenderThemeNixh">trunk/Source/WebCore/platform/nix/RenderThemeNix.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemecpp">trunk/Source/WebCore/rendering/RenderTheme.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeh">trunk/Source/WebCore/rendering/RenderTheme.h</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>
<li><a href="#trunkSourceWebCorerenderingRenderThemeSafaricpp">trunk/Source/WebCore/rendering/RenderThemeSafari.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeSafarih">trunk/Source/WebCore/rendering/RenderThemeSafari.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeWincpp">trunk/Source/WebCore/rendering/RenderThemeWin.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeWinh">trunk/Source/WebCore/rendering/RenderThemeWin.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeWinCEcpp">trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeWinCEh">trunk/Source/WebCore/rendering/RenderThemeWinCE.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/ChangeLog 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2013-12-04 Daniel Bates <dabates@apple.com>
+
+ Rename RenderTheme::paintMenuListButton()
+ https://bugs.webkit.org/show_bug.cgi?id=125193
+
+ Reviewed by Simon Fraser.
+
+ Towards upstreaming the iOS concept of render theme decorations we should rename
+ RenderTheme::paintMenuListButton() to RenderTheme::paintMenuListButtonDecorations()
+ to better describe its purpose.
+
+ Also, fix code style issues.
+
+ * platform/blackberry/RenderThemeBlackBerry.cpp:
+ (WebCore::RenderThemeBlackBerry::paintMenuListButtonDecorations):
+ * platform/blackberry/RenderThemeBlackBerry.h:
+ * platform/efl/RenderThemeEfl.cpp:
+ (WebCore::RenderThemeEfl::paintMenuListButtonDecorations):
+ * platform/efl/RenderThemeEfl.h:
+ * platform/gtk/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::paintMenuListButtonDecorations):
+ * platform/gtk/RenderThemeGtk.h:
+ * platform/nix/RenderThemeNix.h:
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::paintDecorations): Rename argument o, r to renderer and rect, respectively.
+ * rendering/RenderTheme.h:
+ (WebCore::RenderTheme::paintMenuListButtonDecorations):
+ * rendering/RenderThemeMac.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintMenuListButtonDecorations): Rename argument o, r to renderer and rect,
+ respectively; also remove extraneous white space and substitute 1 for 1.0f.
+ * rendering/RenderThemeSafari.cpp:
+ (WebCore::RenderThemeSafari::paintMenuListButtonDecorations): Ditto.
+ * rendering/RenderThemeSafari.h:
+ * rendering/RenderThemeWin.cpp:
+ (WebCore::RenderThemeWin::paintMenuList): Rename argument o, i, r to renderer, paintInfo, and rect,
+ respectively.
+ (WebCore::RenderThemeWin::paintMenuListButtonDecorations): Ditto.
+ * rendering/RenderThemeWin.h:
+ * rendering/RenderThemeWinCE.cpp:
+ (WebCore::RenderThemeWinCE::paintMenuList): Ditto.
+ (WebCore::RenderThemeWinCE::paintMenuListButtonDecorations): Ditto.
+ * rendering/RenderThemeWinCE.h:
+
</ins><span class="cx"> 2013-12-04 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Build projects with $(ARCHS_STANDARD_32_64_BIT)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformblackberryRenderThemeBlackBerrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.cpp 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -618,7 +618,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeBlackBerry::paintMenuListButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeBlackBerry::paintMenuListButtonDecorations(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintMenuList(object, info, rect);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformblackberryRenderThemeBlackBerryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.h (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.h 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/platform/blackberry/RenderThemeBlackBerry.h 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> virtual bool paintButton(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx"> void calculateButtonSize(RenderStyle*) const;
</span><span class="cx"> virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustSliderThumbSize(RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx"> virtual bool paintSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflRenderThemeEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -892,7 +892,7 @@
</span><span class="cx"> adjustMenuListStyle(styleResolver, style, element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintMenuListButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintMenuListButtonDecorations(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintMenuList(object, info, rect);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflRenderThemeEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.h (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.h 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.h 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx">
</span><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInfo&, const IntRect&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> adjustMenuListStyle(styleResolver, style, e);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMenuListButton(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintMenuListButtonDecorations(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintMenuList(object, info, rect);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
</span><del>- virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInfo&, const IntRect&);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnixRenderThemeNixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/nix/RenderThemeNix.h (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/nix/RenderThemeNix.h 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/platform/nix/RenderThemeNix.h 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -88,7 +88,10 @@
</span><span class="cx">
</span><span class="cx"> virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
</span><span class="cx"> virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const OVERRIDE;
</span><del>- virtual bool paintMenuListButton(RenderObject* o, const PaintInfo& i, const IntRect& r) OVERRIDE { return paintMenuList(o, i, r); }
</del><ins>+ virtual bool paintMenuListButtonDecorations(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect) OVERRIDE
+ {
+ return paintMenuList(renderer, paintInfo, rect);
+ }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustInnerSpinButtonStyle(StyleResolver*, RenderStyle*, Element*) const OVERRIDE;
</span><span class="cx"> virtual bool paintInnerSpinButton(RenderObject*, const PaintInfo&, const IntRect&) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -442,15 +442,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTheme::paintDecorations(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderTheme::paintDecorations(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> if (paintInfo.context->paintingDisabled())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Call the appropriate paint method based off the appearance value.
</span><del>- switch (o->style().appearance()) {
</del><ins>+ switch (renderer->style().appearance()) {
</ins><span class="cx"> case MenulistButtonPart:
</span><del>- return paintMenuListButton(o, paintInfo, r);
</del><ins>+ return paintMenuListButtonDecorations(renderer, paintInfo, rect);
</ins><span class="cx"> case TextFieldPart:
</span><span class="cx"> case TextAreaPart:
</span><span class="cx"> case ListboxPart:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.h (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.h 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/rendering/RenderTheme.h 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</span><span class="cx">
</span><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><del>- virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(METER_ELEMENT)
</span><span class="cx"> virtual void adjustMeterStyle(StyleResolver*, RenderStyle*, Element*) const;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.h 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx"> virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -1191,29 +1191,29 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintMenuListButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeMac::paintMenuListButtonDecorations(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- IntRect bounds = IntRect(r.x() + o->style().borderLeftWidth(),
- r.y() + o->style().borderTopWidth(),
- r.width() - o->style().borderLeftWidth() - o->style().borderRightWidth(),
- r.height() - o->style().borderTopWidth() - o->style().borderBottomWidth());
</del><ins>+ IntRect bounds = IntRect(rect.x() + renderer->style().borderLeftWidth(),
+ rect.y() + renderer->style().borderTopWidth(),
+ rect.width() - renderer->style().borderLeftWidth() - renderer->style().borderRightWidth(),
+ rect.height() - renderer->style().borderTopWidth() - renderer->style().borderBottomWidth());
</ins><span class="cx"> // Draw the gradients to give the styled popup menu a button appearance
</span><del>- paintMenuListButtonGradients(o, paintInfo, bounds);
</del><ins>+ paintMenuListButtonGradients(renderer, paintInfo, bounds);
</ins><span class="cx">
</span><span class="cx"> // Since we actually know the size of the control here, we restrict the font scale to make sure the arrows will fit vertically in the bounds
</span><del>- float fontScale = std::min(o->style().fontSize() / baseFontSize, bounds.height() / (baseArrowHeight * 2 + baseSpaceBetweenArrows));
</del><ins>+ float fontScale = std::min(renderer->style().fontSize() / baseFontSize, bounds.height() / (baseArrowHeight * 2 + baseSpaceBetweenArrows));
</ins><span class="cx"> float centerY = bounds.y() + bounds.height() / 2.0f;
</span><span class="cx"> float arrowHeight = baseArrowHeight * fontScale;
</span><span class="cx"> float arrowWidth = baseArrowWidth * fontScale;
</span><del>- float leftEdge = bounds.maxX() - arrowPaddingRight * o->style().effectiveZoom() - arrowWidth;
</del><ins>+ float leftEdge = bounds.maxX() - arrowPaddingRight * renderer->style().effectiveZoom() - arrowWidth;
</ins><span class="cx"> float spaceBetweenArrows = baseSpaceBetweenArrows * fontScale;
</span><span class="cx">
</span><del>- if (bounds.width() < arrowWidth + arrowPaddingLeft * o->style().effectiveZoom())
</del><ins>+ if (bounds.width() < arrowWidth + arrowPaddingLeft * renderer->style().effectiveZoom())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx">
</span><del>- paintInfo.context->setFillColor(o->style().visitedDependentColor(CSSPropertyColor), o->style().colorSpace());
</del><ins>+ paintInfo.context->setFillColor(renderer->style().visitedDependentColor(CSSPropertyColor), renderer->style().colorSpace());
</ins><span class="cx"> paintInfo.context->setStrokeStyle(NoStroke);
</span><span class="cx">
</span><span class="cx"> FloatPoint arrow1[3];
</span><span class="lines">@@ -1237,10 +1237,10 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Should the separator thickness and space be scaled up by fontScale?
</span><span class="cx"> int separatorSpace = 2; // Deliberately ignores zoom since it looks nicer if it stays thin.
</span><del>- int leftEdgeOfSeparator = static_cast<int>(leftEdge - arrowPaddingLeft * o->style().effectiveZoom()); // FIXME: Round?
</del><ins>+ int leftEdgeOfSeparator = static_cast<int>(leftEdge - arrowPaddingLeft * renderer->style().effectiveZoom()); // FIXME: Round?
</ins><span class="cx">
</span><span class="cx"> // Draw the separator to the left of the arrows
</span><del>- paintInfo.context->setStrokeThickness(1.0f); // Deliberately ignores zoom since it looks nicer if it stays thin.
</del><ins>+ paintInfo.context->setStrokeThickness(1); // Deliberately ignores zoom since it looks nicer if it stays thin.
</ins><span class="cx"> paintInfo.context->setStrokeStyle(SolidStroke);
</span><span class="cx"> paintInfo.context->setStrokeColor(leftSeparatorColor, ColorSpaceDeviceRGB);
</span><span class="cx"> paintInfo.context->drawLine(IntPoint(leftEdgeOfSeparator, bounds.y()),
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeSafaricpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.cpp (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -807,17 +807,17 @@
</span><span class="cx"> paintInfo.context->restore();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintMenuListButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeSafari::paintMenuListButtonDecorations(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- IntRect bounds = IntRect(r.x() + o->style().borderLeftWidth(),
- r.y() + o->style().borderTopWidth(),
- r.width() - o->style().borderLeftWidth() - o->style().borderRightWidth(),
- r.height() - o->style().borderTopWidth() - o->style().borderBottomWidth());
</del><ins>+ IntRect bounds = IntRect(rect.x() + renderer->style().borderLeftWidth(),
+ rect.y() + renderer->style().borderTopWidth(),
+ rect.width() - renderer->style().borderLeftWidth() - renderer->style().borderRightWidth(),
+ rect.height() - renderer->style().borderTopWidth() - renderer->style().borderBottomWidth());
</ins><span class="cx"> // Draw the gradients to give the styled popup menu a button appearance
</span><del>- paintMenuListButtonGradients(o, paintInfo, bounds);
-
</del><ins>+ paintMenuListButtonGradients(renderer, paintInfo, bounds);
+
</ins><span class="cx"> // Since we actually know the size of the control here, we restrict the font scale to make sure the arrow will fit vertically in the bounds
</span><del>- float fontScale = min(o->style().fontSize() / baseFontSize, bounds.height() / baseArrowHeight);
</del><ins>+ float fontScale = min(renderer->style().fontSize() / baseFontSize, bounds.height() / baseArrowHeight);
</ins><span class="cx"> float centerY = bounds.y() + bounds.height() / 2.0f;
</span><span class="cx"> float arrowHeight = baseArrowHeight * fontScale;
</span><span class="cx"> float arrowWidth = baseArrowWidth * fontScale;
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx">
</span><span class="cx"> paintInfo.context->save();
</span><span class="cx">
</span><del>- paintInfo.context->setFillColor(o->style().visitedDependentColor(CSSPropertyColor), ColorSpaceDeviceRGB);
</del><ins>+ paintInfo.context->setFillColor(renderer->style().visitedDependentColor(CSSPropertyColor), ColorSpaceDeviceRGB);
</ins><span class="cx"> paintInfo.context->setStrokeColor(NoStroke, ColorSpaceDeviceRGB);
</span><span class="cx">
</span><span class="cx"> FloatPoint arrow[3];
</span><span class="lines">@@ -841,13 +841,13 @@
</span><span class="cx">
</span><span class="cx"> Color leftSeparatorColor(0, 0, 0, 40);
</span><span class="cx"> Color rightSeparatorColor(255, 255, 255, 40);
</span><del>-
</del><ins>+
</ins><span class="cx"> // FIXME: Should the separator thickness and space be scaled up by fontScale?
</span><span class="cx"> int separatorSpace = 2;
</span><span class="cx"> int leftEdgeOfSeparator = static_cast<int>(leftEdge - arrowPaddingLeft); // FIXME: Round?
</span><span class="cx">
</span><span class="cx"> // Draw the separator to the left of the arrows
</span><del>- paintInfo.context->setStrokeThickness(1.0f);
</del><ins>+ paintInfo.context->setStrokeThickness(1);
</ins><span class="cx"> paintInfo.context->setStrokeStyle(SolidStroke);
</span><span class="cx"> paintInfo.context->setStrokeColor(leftSeparatorColor, ColorSpaceDeviceRGB);
</span><span class="cx"> paintInfo.context->drawLine(IntPoint(leftEdgeOfSeparator, bounds.y()),
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeSafarih"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.h (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeSafari.h 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.h 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx"> virtual void adjustMenuListStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><span class="cx"> virtual bool paintSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -777,13 +777,13 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintMenuList(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintMenuList(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> HANDLE theme;
</span><span class="cx"> int part;
</span><span class="cx"> if (haveTheme && (windowsVersion() >= WindowsVista)) {
</span><span class="cx"> theme = menuListTheme();
</span><del>- if (o->frame().settings().applicationChromeMode())
</del><ins>+ if (renderer->frame().settings().applicationChromeMode())
</ins><span class="cx"> part = CP_READONLY;
</span><span class="cx"> else
</span><span class="cx"> part = CP_BORDER;
</span><span class="lines">@@ -792,9 +792,9 @@
</span><span class="cx"> part = TFP_TEXTFIELD;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- drawControl(i.context, o, theme, ThemeData(part, determineState(o)), r);
</del><ins>+ drawControl(i.context, renderer, theme, ThemeData(part, determineState(renderer)), rect);
</ins><span class="cx">
</span><del>- return paintMenuListButton(o, i, r);
</del><ins>+ return paintMenuListButtonDecorations(renderer, paintInfo, rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderThemeWin::adjustMenuListStyle(StyleResolver* styleResolver, RenderStyle* style, Element* e) const
</span><span class="lines">@@ -834,16 +834,16 @@
</span><span class="cx"> style->setWhiteSpace(PRE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintMenuListButton(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintMenuListButtonDecorations(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Don't make hardcoded assumptions about the thickness of the textfield border.
</span><span class="cx"> int borderThickness = haveTheme ? 1 : 2;
</span><span class="cx">
</span><span class="cx"> // Paint the dropdown button on the inner edge of the text field,
</span><span class="cx"> // leaving space for the text field's 1px border
</span><del>- IntRect buttonRect(r);
</del><ins>+ IntRect buttonRect(rect);
</ins><span class="cx"> buttonRect.inflate(-borderThickness);
</span><del>- if (o->style().direction() == LTR)
</del><ins>+ if (renderer->style().direction() == LTR)
</ins><span class="cx"> buttonRect.setX(buttonRect.maxX() - dropDownButtonWidth);
</span><span class="cx"> buttonRect.setWidth(dropDownButtonWidth);
</span><span class="cx">
</span><span class="lines">@@ -854,7 +854,7 @@
</span><span class="cx"> buttonRect.setWidth(buttonRect.width() + vistaMenuListButtonOutset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- drawControl(i.context, o, menuListTheme(), getThemeData(o), buttonRect);
</del><ins>+ drawControl(paintInfo.context, renderer, menuListTheme(), getThemeData(renderer), buttonRect);
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWin.h (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWin.h 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.h 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual bool paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& r);
</span><span class="cx"> virtual bool paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& r);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWinCEcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -242,18 +242,18 @@
</span><span class="cx"> adjustMenuListButtonStyle(styleResolver, style, e);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWinCE::paintMenuList(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+bool RenderThemeWinCE::paintMenuList(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- paintTextField(o, i, r);
- paintMenuListButton(o, i, r);
</del><ins>+ paintTextField(renderer, paintInfo, rect);
+ paintMenuListButtonDecorations(renderer, paintInfo, rect);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWinCE::paintMenuListButton(RenderObject* o, const PaintInfo& i, const IntRect& r)
</del><ins>+bool RenderThemeWinCE::paintMenuListButtonDecorations(RenderObject* renderer, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><del>- IntRect buttonRect(r.maxX() - dropDownButtonWidth - 1, r.y(), dropDownButtonWidth, r.height());
</del><ins>+ IntRect buttonRect(rect.maxX() - dropDownButtonWidth - 1, rect.y(), dropDownButtonWidth, rect.height());
</ins><span class="cx"> buttonRect.inflateY(-1);
</span><del>- i.context->drawFrameControl(buttonRect, DFC_SCROLL, DFCS_SCROLLCOMBOBOX | determineClassicState(o));
</del><ins>+ paintInfo.context->drawFrameControl(buttonRect, DFC_SCROLL, DFCS_SCROLLCOMBOBOX | determineClassicState(renderer));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWinCEh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWinCE.h (160112 => 160113)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWinCE.h 2013-12-04 19:56:46 UTC (rev 160112)
+++ trunk/Source/WebCore/rendering/RenderThemeWinCE.h 2013-12-04 20:17:46 UTC (rev 160113)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx">
</span><del>- virtual bool paintMenuListButton(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual bool paintSliderTrack(RenderObject* o, const PaintInfo& i, const IntRect& r);
</span><span class="cx"> virtual bool paintSliderThumb(RenderObject* o, const PaintInfo& i, const IntRect& r);
</span></span></pre>
</div>
</div>
</body>
</html>