<!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>[187878] 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/187878">187878</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-08-04 12:47:56 -0700 (Tue, 04 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderTheme::baselinePosition() should take RenderBox instead of RenderObject.
https://bugs.webkit.org/show_bug.cgi?id=147632
Reviewed by Andreas Kling.
It eliminates some redundant type checking and casting.
No change in functionality.
* platform/efl/RenderThemeEfl.cpp:
(WebCore::RenderThemeEfl::baselinePosition):
* platform/efl/RenderThemeEfl.h:
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::baselinePosition):
* rendering/RenderTheme.h:
* rendering/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::baselinePosition):
* rendering/RenderThemeGtk.h:
* rendering/RenderThemeIOS.h:
* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::baselinePosition):
* rendering/RenderThemeSafari.cpp:
(WebCore::RenderThemeSafari::baselinePosition):
* rendering/RenderThemeSafari.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorerenderingRenderThemecpp">trunk/Source/WebCore/rendering/RenderTheme.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="#trunkSourceWebCorerenderingRenderThemeSafaricpp">trunk/Source/WebCore/rendering/RenderThemeSafari.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeSafarih">trunk/Source/WebCore/rendering/RenderThemeSafari.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187877 => 187878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-04 19:47:44 UTC (rev 187877)
+++ trunk/Source/WebCore/ChangeLog 2015-08-04 19:47:56 UTC (rev 187878)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-08-04 Zalan Bujtas <zalan@apple.com>
+
+ RenderTheme::baselinePosition() should take RenderBox instead of RenderObject.
+ https://bugs.webkit.org/show_bug.cgi?id=147632
+
+ Reviewed by Andreas Kling.
+
+ It eliminates some redundant type checking and casting.
+
+ No change in functionality.
+
+ * platform/efl/RenderThemeEfl.cpp:
+ (WebCore::RenderThemeEfl::baselinePosition):
+ * platform/efl/RenderThemeEfl.h:
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::baselinePosition):
+ * rendering/RenderTheme.h:
+ * rendering/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::baselinePosition):
+ * rendering/RenderThemeGtk.h:
+ * rendering/RenderThemeIOS.h:
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::RenderThemeIOS::baselinePosition):
+ * rendering/RenderThemeSafari.cpp:
+ (WebCore::RenderThemeSafari::baselinePosition):
+ * rendering/RenderThemeSafari.h:
+
</ins><span class="cx"> 2015-08-04 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Enable WebGL on Windows CMake build.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflRenderThemeEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (187877 => 187878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2015-08-04 19:47:44 UTC (rev 187877)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2015-08-04 19:47:56 UTC (rev 187878)
</span><span class="lines">@@ -653,16 +653,11 @@
</span><span class="cx"> return isEnabled(object);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderThemeEfl::baselinePosition(const RenderObject& object) const
</del><ins>+int RenderThemeEfl::baselinePosition(const RenderBox& box) const
</ins><span class="cx"> {
</span><del>- if (!is<RenderBox>(object))
- return 0;
-
- if (object.style().appearance() == CheckboxPart
- || object.style().appearance() == RadioPart)
- return downcast<RenderBox>(object).marginTop() + downcast<RenderBox>(object).height() - 3;
-
- return RenderTheme::baselinePosition(object);
</del><ins>+ if (box.style().appearance() == CheckboxPart || box.style().appearance() == RadioPart)
+ return box.marginTop() + box.height() - 3;
+ return RenderTheme::baselinePosition(box);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Color RenderThemeEfl::platformActiveSelectionBackgroundColor() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflRenderThemeEflh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.h (187877 => 187878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.h 2015-08-04 19:47:44 UTC (rev 187877)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.h 2015-08-04 19:47:56 UTC (rev 187878)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> // A method to obtain the baseline position for a "leaf" control. This will only be used if a baseline
</span><span class="cx"> // position cannot be determined by examining child content. Checkboxes and radio buttons are examples of
</span><span class="cx"> // controls that need to do this.
</span><del>- virtual int baselinePosition(const RenderObject&) const override;
</del><ins>+ virtual int baselinePosition(const RenderBox&) const override;
</ins><span class="cx">
</span><span class="cx"> virtual Color platformActiveSelectionBackgroundColor() const override;
</span><span class="cx"> virtual Color platformInactiveSelectionBackgroundColor() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (187877 => 187878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-08-04 19:47:44 UTC (rev 187877)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-08-04 19:47:56 UTC (rev 187878)
</span><span class="lines">@@ -664,15 +664,10 @@
</span><span class="cx"> return platformInactiveSelectionForegroundColor();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderTheme::baselinePosition(const RenderObject& renderer) const
</del><ins>+int RenderTheme::baselinePosition(const RenderBox& box) const
</ins><span class="cx"> {
</span><del>- if (!is<RenderBox>(renderer))
- return 0;
-
- const auto& box = downcast<RenderBox>(renderer);
-
</del><span class="cx"> #if USE(NEW_THEME)
</span><del>- return box.height() + box.marginTop() + m_theme->baselinePositionAdjustment(renderer.style().appearance()) * renderer.style().effectiveZoom();
</del><ins>+ return box.height() + box.marginTop() + m_theme->baselinePositionAdjustment(box.style().appearance()) * box.style().effectiveZoom();
</ins><span class="cx"> #else
</span><span class="cx"> return box.height() + box.marginTop();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.h (187877 => 187878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.h 2015-08-04 19:47:44 UTC (rev 187877)
+++ trunk/Source/WebCore/rendering/RenderTheme.h 2015-08-04 19:47:56 UTC (rev 187878)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> // A method to obtain the baseline position for a "leaf" control. This will only be used if a baseline
</span><span class="cx"> // position cannot be determined by examining child content. Checkboxes and radio buttons are examples of
</span><span class="cx"> // controls that need to do this.
</span><del>- virtual int baselinePosition(const RenderObject&) const;
</del><ins>+ virtual int baselinePosition(const RenderBox&) const;
</ins><span class="cx">
</span><span class="cx"> // A method for asking if a control is a container or not. Leaf controls have to have some special behavior (like
</span><span class="cx"> // the baseline position API above).
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (187877 => 187878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2015-08-04 19:47:44 UTC (rev 187877)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2015-08-04 19:47:56 UTC (rev 187878)
</span><span class="lines">@@ -374,18 +374,12 @@
</span><span class="cx"> return isEnabled(o);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderThemeGtk::baselinePosition(const RenderObject& renderer) const
</del><ins>+int RenderThemeGtk::baselinePosition(const RenderBox& box) const
</ins><span class="cx"> {
</span><del>- if (!is<RenderBox>(renderer))
- return 0;
-
</del><span class="cx"> // FIXME: This strategy is possibly incorrect for the GTK+ port.
</span><del>- if (renderer.style().appearance() == CheckboxPart || renderer.style().appearance() == RadioPart) {
- const auto& box = downcast<RenderBox>(renderer);
</del><ins>+ if (box.style().appearance() == CheckboxPart || box.style().appearance() == RadioPart)
</ins><span class="cx"> return box.marginTop() + box.height() - 2;
</span><del>- }
-
- return RenderTheme::baselinePosition(renderer);
</del><ins>+ return RenderTheme::baselinePosition(box);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static GtkTextDirection gtkTextDirection(TextDirection direction)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.h (187877 => 187878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.h 2015-08-04 19:47:44 UTC (rev 187877)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.h 2015-08-04 19:47:56 UTC (rev 187878)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> // A method to obtain the baseline position for a "leaf" control. This will only be used if a baseline
</span><span class="cx"> // position cannot be determined by examining child content. Checkboxes and radio buttons are examples of
</span><span class="cx"> // controls that need to do this.
</span><del>- virtual int baselinePosition(const RenderObject&) const override;
</del><ins>+ virtual int baselinePosition(const RenderBox&) const override;
</ins><span class="cx">
</span><span class="cx"> // The platform selection color.
</span><span class="cx"> virtual Color platformActiveSelectionBackgroundColor() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.h (187877 => 187878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.h 2015-08-04 19:47:44 UTC (rev 187877)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.h 2015-08-04 19:47:56 UTC (rev 187878)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> virtual FontDescription& cachedSystemFontDescription(CSSValueID systemFontID) const override;
</span><span class="cx"> virtual void updateCachedSystemFontDescription(CSSValueID, FontDescription&) const override;
</span><del>- virtual int baselinePosition(const RenderObject&) const override;
</del><ins>+ virtual int baselinePosition(const RenderBox&) const override;
</ins><span class="cx">
</span><span class="cx"> virtual bool isControlStyled(const RenderStyle&, const BorderData&, const FillLayer& background, const Color& backgroundColor) const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (187877 => 187878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2015-08-04 19:47:44 UTC (rev 187877)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2015-08-04 19:47:56 UTC (rev 187878)
</span><span class="lines">@@ -416,13 +416,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderThemeIOS::baselinePosition(const RenderObject& renderer) const
</del><ins>+int RenderThemeIOS::baselinePosition(const RenderBox& box) const
</ins><span class="cx"> {
</span><del>- if (!is<RenderBox>(renderer))
- return 0;
-
- const auto& box = downcast<RenderBox>(renderer);
-
</del><span class="cx"> if (box.style().appearance() == CheckboxPart || box.style().appearance() == RadioPart)
</span><span class="cx"> return box.marginTop() + box.height() - 2; // The baseline is 2px up from the bottom of the checkbox/radio in AppKit.
</span><span class="cx"> if (box.style().appearance() == MenulistPart)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeSafaricpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.cpp (187877 => 187878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2015-08-04 19:47:44 UTC (rev 187877)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2015-08-04 19:47:56 UTC (rev 187878)
</span><span class="lines">@@ -293,17 +293,11 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderThemeSafari::baselinePosition(const RenderObject& renderer) const
</del><ins>+int RenderThemeSafari::baselinePosition(const RenderBox& box) const
</ins><span class="cx"> {
</span><del>- if (!is<RenderBox>(renderer))
- return 0;
-
- if (renderer.style().appearance() == CheckboxPart || renderer.style().appearance() == RadioPart) {
- const auto& box = downcast<RenderBox>(renderer);
</del><ins>+ if (box.style().appearance() == CheckboxPart || box.style().appearance() == RadioPart)
</ins><span class="cx"> return box.marginTop() + box.height() - 2; // The baseline is 2px up from the bottom of the checkbox/radio in AppKit.
</span><del>- }
-
- return RenderTheme::baselinePosition(renderer);
</del><ins>+ return RenderTheme::baselinePosition(box);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderThemeSafari::controlSupportsTints(const RenderObject& o) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeSafarih"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.h (187877 => 187878)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeSafari.h 2015-08-04 19:47:44 UTC (rev 187877)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.h 2015-08-04 19:47:56 UTC (rev 187878)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> // A method to obtain the baseline position for a "leaf" control. This will only be used if a baseline
</span><span class="cx"> // position cannot be determined by examining child content. Checkboxes and radio buttons are examples of
</span><span class="cx"> // controls that need to do this.
</span><del>- virtual int baselinePosition(const RenderObject&) const;
</del><ins>+ virtual int baselinePosition(const RenderBox&) const;
</ins><span class="cx">
</span><span class="cx"> // A method asking if the control changes its tint when the window has focus or not.
</span><span class="cx"> virtual bool controlSupportsTints(const RenderObject&) const;
</span></span></pre>
</div>
</div>
</body>
</html>