<!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>[160226] 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/160226">160226</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-06 10:13:29 -0800 (Fri, 06 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename {adjust, paint}SearchFieldDecoration, {adjust, paint}SearchFieldResultsDecoration
https://bugs.webkit.org/show_bug.cgi?id=125191
Reviewed by Joseph Pecoraro.
Towards upstreaming the iOS concept of render theme decorations, we should rename
RenderTheme::{adjust, paint}SearchFieldDecorationStyle and RenderTheme::{adjust, paint}SearchFieldResultsDecoration
to avoid ambiguity with the iOS concept.
* platform/efl/RenderThemeEfl.cpp:
* platform/efl/RenderThemeEfl.h:
* platform/gtk/RenderThemeGtk.cpp:
* platform/gtk/RenderThemeGtk.h:
* rendering/RenderTheme.cpp:
* rendering/RenderTheme.h:
* rendering/RenderThemeMac.h:
* rendering/RenderThemeMac.mm:
* rendering/RenderThemeSafari.cpp:
* rendering/RenderThemeSafari.h:
* rendering/RenderThemeWin.cpp:
* rendering/RenderThemeWin.h:
* rendering/RenderThemeWinCE.cpp:
* rendering/RenderThemeWinCE.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="#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="#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 (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/ChangeLog 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2013-12-06 Daniel Bates <dabates@apple.com>
+
+ Rename {adjust, paint}SearchFieldDecoration, {adjust, paint}SearchFieldResultsDecoration
+ https://bugs.webkit.org/show_bug.cgi?id=125191
+
+ Reviewed by Joseph Pecoraro.
+
+ Towards upstreaming the iOS concept of render theme decorations, we should rename
+ RenderTheme::{adjust, paint}SearchFieldDecorationStyle and RenderTheme::{adjust, paint}SearchFieldResultsDecoration
+ to avoid ambiguity with the iOS concept.
+
+ * platform/efl/RenderThemeEfl.cpp:
+ * platform/efl/RenderThemeEfl.h:
+ * platform/gtk/RenderThemeGtk.cpp:
+ * platform/gtk/RenderThemeGtk.h:
+ * rendering/RenderTheme.cpp:
+ * rendering/RenderTheme.h:
+ * rendering/RenderThemeMac.h:
+ * rendering/RenderThemeMac.mm:
+ * rendering/RenderThemeSafari.cpp:
+ * rendering/RenderThemeSafari.h:
+ * rendering/RenderThemeWin.cpp:
+ * rendering/RenderThemeWin.h:
+ * rendering/RenderThemeWinCE.cpp:
+ * rendering/RenderThemeWinCE.h:
+
</ins><span class="cx"> 2013-12-06 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Make remaining CSSValue constructors return PassRef.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflRenderThemeEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.cpp 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -943,10 +943,10 @@
</span><span class="cx"> return paintThemePart(object, SearchFieldResultsButton, info, rect);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeEfl::adjustSearchFieldResultsDecorationStyle(StyleResolver* styleResolver, RenderStyle* style, Element* element) const
</del><ins>+void RenderThemeEfl::adjustSearchFieldResultsDecorationPartStyle(StyleResolver* styleResolver, RenderStyle* style, Element* element) const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page && element && element->document().page()) {
</span><del>- static_cast<RenderThemeEfl*>(element->document().page()->theme())->adjustSearchFieldResultsDecorationStyle(styleResolver, style, element);
</del><ins>+ static_cast<RenderThemeEfl*>(element->document().page()->theme())->adjustSearchFieldResultsDecorationPartStyle(styleResolver, style, element);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> adjustSizeConstraints(style, SearchFieldResultsDecoration);
</span><span class="lines">@@ -960,7 +960,7 @@
</span><span class="cx"> style->setHeight(Length(decorationSize, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeEfl::paintSearchFieldResultsDecoration(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</del><ins>+bool RenderThemeEfl::paintSearchFieldResultsDecorationPart(RenderObject* object, const PaintInfo& info, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintThemePart(object, SearchFieldResultsDecoration, 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 (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/efl/RenderThemeEfl.h 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/platform/efl/RenderThemeEfl.h 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -143,8 +143,8 @@
</span><span class="cx"> virtual void adjustMenuListButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx">
</span><del>- virtual void adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
+ virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchField(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 (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderThemeGtk::paintSearchFieldResultsButton(RenderObject* o, const PaintInfo& i, const IntRect& rect)
</span><span class="cx"> {
</span><del>- return paintSearchFieldResultsDecoration(o, i, rect);
</del><ins>+ return paintSearchFieldResultsDecorationPart(o, i, rect);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void adjustSearchFieldIconStyle(RenderStyle* style)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> style->setHeight(Length(height, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeGtk::adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle* style, Element*) const
</del><ins>+void RenderThemeGtk::adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle* style, Element*) const
</ins><span class="cx"> {
</span><span class="cx"> adjustSearchFieldIconStyle(style);
</span><span class="cx"> }
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx"> return scaledRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSearchFieldResultsDecoration(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintSearchFieldResultsDecorationPart(RenderObject* renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> IntRect iconRect = centerRectVerticallyInParentInputElement(renderObject, rect);
</span><span class="cx"> if (iconRect.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkRenderThemeGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/platform/gtk/RenderThemeGtk.h 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -139,8 +139,8 @@
</span><span class="cx"> virtual bool paintMenuList(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx"> virtual bool paintMenuListButtonDecorations(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx">
</span><del>- virtual void adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
+ virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchField(RenderObject*, const PaintInfo&, const IntRect&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -231,9 +231,9 @@
</span><span class="cx"> case SearchFieldCancelButtonPart:
</span><span class="cx"> return adjustSearchFieldCancelButtonStyle(styleResolver, style, e);
</span><span class="cx"> case SearchFieldDecorationPart:
</span><del>- return adjustSearchFieldDecorationStyle(styleResolver, style, e);
</del><ins>+ return adjustSearchFieldDecorationPartStyle(styleResolver, style, e);
</ins><span class="cx"> case SearchFieldResultsDecorationPart:
</span><del>- return adjustSearchFieldResultsDecorationStyle(styleResolver, style, e);
</del><ins>+ return adjustSearchFieldResultsDecorationPartStyle(styleResolver, style, e);
</ins><span class="cx"> case SearchFieldResultsButtonPart:
</span><span class="cx"> return adjustSearchFieldResultsButtonStyle(styleResolver, style, e);
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><span class="lines">@@ -374,9 +374,9 @@
</span><span class="cx"> case SearchFieldCancelButtonPart:
</span><span class="cx"> return paintSearchFieldCancelButton(o, paintInfo, r);
</span><span class="cx"> case SearchFieldDecorationPart:
</span><del>- return paintSearchFieldDecoration(o, paintInfo, r);
</del><ins>+ return paintSearchFieldDecorationPart(o, paintInfo, r);
</ins><span class="cx"> case SearchFieldResultsDecorationPart:
</span><del>- return paintSearchFieldResultsDecoration(o, paintInfo, r);
</del><ins>+ return paintSearchFieldResultsDecorationPart(o, paintInfo, r);
</ins><span class="cx"> case SearchFieldResultsButtonPart:
</span><span class="cx"> return paintSearchFieldResultsButton(o, paintInfo, r);
</span><span class="cx"> case SnapshottedPluginOverlayPart:
</span><span class="lines">@@ -1099,11 +1099,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderTheme::adjustSearchFieldDecorationStyle(StyleResolver*, RenderStyle*, Element*) const
</del><ins>+void RenderTheme::adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderTheme::adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle*, Element*) const
</del><ins>+void RenderTheme::adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.h (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.h 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/rendering/RenderTheme.h 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -310,11 +310,11 @@
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</span><span class="cx">
</span><del>- virtual void adjustSearchFieldDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual void adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
+ virtual bool paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><del>- virtual void adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
+ virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchFieldResultsButton(RenderObject*, const PaintInfo&, const IntRect&) { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.h (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.h 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.h 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -142,11 +142,11 @@
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx">
</span><del>- virtual void adjustSearchFieldDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
+ virtual bool paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><del>- virtual void adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
+ virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchFieldResultsButton(RenderObject*, const PaintInfo&, const IntRect&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -1642,7 +1642,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const int emptyResultsOffset = 9;
</span><del>-void RenderThemeMac::adjustSearchFieldDecorationStyle(StyleResolver*, RenderStyle* style, Element*) const
</del><ins>+void RenderThemeMac::adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle* style, Element*) const
</ins><span class="cx"> {
</span><span class="cx"> IntSize size = sizeForSystemFont(style, resultsButtonSizes());
</span><span class="cx"> style->setWidth(Length(size.width() - emptyResultsOffset, Fixed));
</span><span class="lines">@@ -1650,12 +1650,12 @@
</span><span class="cx"> style->setBoxShadow(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&)
</del><ins>+bool RenderThemeMac::paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeMac::adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle* style, Element*) const
</del><ins>+void RenderThemeMac::adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle* style, Element*) const
</ins><span class="cx"> {
</span><span class="cx"> IntSize size = sizeForSystemFont(style, resultsButtonSizes());
</span><span class="cx"> style->setWidth(Length(size.width(), Fixed));
</span><span class="lines">@@ -1663,7 +1663,7 @@
</span><span class="cx"> style->setBoxShadow(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeMac::paintSearchFieldResultsDecoration(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeMac::paintSearchFieldResultsDecorationPart(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> Node* input = o->node()->shadowHost();
</span><span class="cx"> if (!input)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeSafaricpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.cpp (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.cpp 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -1109,26 +1109,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const int emptyResultsOffset = 9;
</span><del>-void RenderThemeSafari::adjustSearchFieldDecorationStyle(StyleResolver*, RenderStyle* style, Element*) const
</del><ins>+void RenderThemeSafari::adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle* style, Element*) const
</ins><span class="cx"> {
</span><span class="cx"> IntSize size = sizeForSystemFont(style, resultsButtonSizes());
</span><span class="cx"> style->setWidth(Length(size.width() - emptyResultsOffset, Fixed));
</span><span class="cx"> style->setHeight(Length(size.height(), Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&)
</del><ins>+bool RenderThemeSafari::paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeSafari::adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle* style, Element*) const
</del><ins>+void RenderThemeSafari::adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle* style, Element*) const
</ins><span class="cx"> {
</span><span class="cx"> IntSize size = sizeForSystemFont(style, resultsButtonSizes());
</span><span class="cx"> style->setWidth(Length(size.width(), Fixed));
</span><span class="cx"> style->setHeight(Length(size.height(), Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeSafari::paintSearchFieldResultsDecoration(RenderObject* o, const PaintInfo& paintInfo, const IntRect&)
</del><ins>+bool RenderThemeSafari::paintSearchFieldResultsDecorationPart(RenderObject* o, const PaintInfo& paintInfo, const IntRect&)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(SafariThemeLibrary());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeSafarih"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeSafari.h (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeSafari.h 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/rendering/RenderThemeSafari.h 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -117,11 +117,11 @@
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx">
</span><del>- virtual void adjustSearchFieldDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
+ virtual bool paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><del>- virtual void adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
+ virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchFieldResultsButton(RenderObject*, const PaintInfo&, const IntRect&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -953,14 +953,14 @@
</span><span class="cx"> style->setHeight(Length(cancelButtonSize, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeWin::adjustSearchFieldDecorationStyle(StyleResolver*, RenderStyle* style, Element*) const
</del><ins>+void RenderThemeWin::adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle* style, Element*) const
</ins><span class="cx"> {
</span><span class="cx"> IntSize emptySize(1, 11);
</span><span class="cx"> style->setWidth(Length(emptySize.width(), Fixed));
</span><span class="cx"> style->setHeight(Length(emptySize.height(), Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeWin::adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle* style, Element*) const
</del><ins>+void RenderThemeWin::adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle* style, Element*) const
</ins><span class="cx"> {
</span><span class="cx"> // Scale the decoration size based on the font size
</span><span class="cx"> float fontScale = style->fontSize() / defaultControlFontPixelSize;
</span><span class="lines">@@ -970,7 +970,7 @@
</span><span class="cx"> style->setHeight(Length(magnifierSize, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintSearchFieldResultsDecoration(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintSearchFieldResultsDecorationPart(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> IntRect bounds = r;
</span><span class="cx"> ASSERT(o->parent());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWin.h (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWin.h 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.h 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -103,11 +103,11 @@
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx">
</span><del>- virtual void adjustSearchFieldDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&) { return false; }
</del><ins>+ virtual void adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
+ virtual bool paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&) { return false; }
</ins><span class="cx">
</span><del>- virtual void adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
+ virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchFieldResultsButton(RenderObject*, const PaintInfo&, const IntRect&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWinCEcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/rendering/RenderThemeWinCE.cpp 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -400,21 +400,21 @@
</span><span class="cx"> style->setHeight(Length(cancelSize.height(), Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeWinCE::adjustSearchFieldDecorationStyle(StyleResolver*, RenderStyle* style, Element*) const
</del><ins>+void RenderThemeWinCE::adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle* style, Element*) const
</ins><span class="cx"> {
</span><span class="cx"> IntSize emptySize(1, 11);
</span><span class="cx"> style->setWidth(Length(emptySize.width(), Fixed));
</span><span class="cx"> style->setHeight(Length(emptySize.height(), Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderThemeWinCE::adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle* style, Element*) const
</del><ins>+void RenderThemeWinCE::adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle* style, Element*) const
</ins><span class="cx"> {
</span><span class="cx"> IntSize magnifierSize(15, 11);
</span><span class="cx"> style->setWidth(Length(magnifierSize.width(), Fixed));
</span><span class="cx"> style->setHeight(Length(magnifierSize.height(), Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWinCE::paintSearchFieldResultsDecoration(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeWinCE::paintSearchFieldResultsDecorationPart(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</ins><span class="cx"> {
</span><span class="cx"> notImplemented();
</span><span class="cx"> return false;
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderThemeWinCE::paintSearchFieldResultsButton(RenderObject* o, const PaintInfo& paintInfo, const IntRect& r)
</span><span class="cx"> {
</span><del>- paintSearchFieldResultsDecoration(o, paintInfo, r);
</del><ins>+ paintSearchFieldResultsDecorationPart(o, paintInfo, r);
</ins><span class="cx"> return false;
</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 (160225 => 160226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWinCE.h 2013-12-06 17:46:29 UTC (rev 160225)
+++ trunk/Source/WebCore/rendering/RenderThemeWinCE.h 2013-12-06 18:13:29 UTC (rev 160226)
</span><span class="lines">@@ -99,11 +99,11 @@
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchFieldCancelButton(RenderObject*, const PaintInfo&, const IntRect&);
</span><span class="cx">
</span><del>- virtual void adjustSearchFieldDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldDecoration(RenderObject*, const PaintInfo&, const IntRect&) { return false; }
</del><ins>+ virtual void adjustSearchFieldDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
+ virtual bool paintSearchFieldDecorationPart(RenderObject*, const PaintInfo&, const IntRect&) { return false; }
</ins><span class="cx">
</span><del>- virtual void adjustSearchFieldResultsDecorationStyle(StyleResolver*, RenderStyle*, Element*) const;
- virtual bool paintSearchFieldResultsDecoration(RenderObject*, const PaintInfo&, const IntRect&);
</del><ins>+ virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver*, RenderStyle*, Element*) const;
+ virtual bool paintSearchFieldResultsDecorationPart(RenderObject*, const PaintInfo&, const IntRect&);
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver*, RenderStyle*, Element*) const;
</span><span class="cx"> virtual bool paintSearchFieldResultsButton(RenderObject*, const PaintInfo&, const IntRect&);
</span></span></pre>
</div>
</div>
</body>
</html>