<!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>[195121] releases/WebKitGTK/webkit-2.10</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/195121">195121</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-15 04:37:36 -0800 (Fri, 15 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194817">r194817</a> - Absolute positioning -webkit-search-cancel-button crashes Safari.
https://bugs.webkit.org/show_bug.cgi?id=152847
<rdar://problem/24112087>
Reviewed by Simon Fraser.
Do not call offsetFromContainer while resolving the painting position for the search/cancel button renderer.
It skips the static positioned parent input renderer, when the search/cancel renderer is absolute positioned.
This patch also fixes a rendering glitch when the margin-right is > 0.
Source/WebCore:
Test: fast/forms/absolute-positioned-custom-search-cancel-crash.html
* rendering/RenderTheme.h:
(WebCore::RenderTheme::paintSearchFieldCancelButton):
(WebCore::RenderTheme::paintSearchFieldResultsDecorationPart):
(WebCore::RenderTheme::paintSearchFieldResultsButton):
* rendering/RenderThemeMac.h:
* rendering/RenderThemeMac.mm:
(WebCore::convertToPaintingPosition):
(WebCore::RenderThemeMac::paintSearchFieldCancelButton):
(WebCore::RenderThemeMac::paintSearchFieldResultsDecorationPart):
(WebCore::RenderThemeMac::paintSearchFieldResultsButton):
(WebCore::RenderThemeMac::convertToPaintingRect): Deleted.
LayoutTests:
* fast/forms/absolute-positioned-custom-search-cancel-crash-expected.txt: Added.
* fast/forms/absolute-positioned-custom-search-cancel-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeh">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderTheme.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeGtkcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeGtkh">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeGtk.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeMach">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeMac.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeWincpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeWin.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeWinh">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeWin.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastformsabsolutepositionedcustomsearchcancelcrashexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/absolute-positioned-custom-search-cancel-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastformsabsolutepositionedcustomsearchcancelcrashhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/absolute-positioned-custom-search-cancel-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195120 => 195121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-15 12:37:09 UTC (rev 195120)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-15 12:37:36 UTC (rev 195121)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-08 Zalan Bujtas <zalan@apple.com>
+
+ Absolute positioning -webkit-search-cancel-button crashes Safari.
+ https://bugs.webkit.org/show_bug.cgi?id=152847
+ <rdar://problem/24112087>
+
+ Reviewed by Simon Fraser.
+
+ Do not call offsetFromContainer while resolving the painting position for the search/cancel button renderer.
+ It skips the static positioned parent input renderer, when the search/cancel renderer is absolute positioned.
+ This patch also fixes a rendering glitch when the margin-right is > 0.
+
+ * fast/forms/absolute-positioned-custom-search-cancel-crash-expected.txt: Added.
+ * fast/forms/absolute-positioned-custom-search-cancel-crash.html: Added.
+
</ins><span class="cx"> 2015-12-09 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [GTK] Anonymous render block flow elements should be exposed as ATK_ROLE_SECTION; not ATK_ROLE_PANEL
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastformsabsolutepositionedcustomsearchcancelcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/absolute-positioned-custom-search-cancel-crash-expected.txt (0 => 195121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/absolute-positioned-custom-search-cancel-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/absolute-positioned-custom-search-cancel-crash-expected.txt 2016-01-15 12:37:36 UTC (rev 195121)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if no crash.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastformsabsolutepositionedcustomsearchcancelcrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/absolute-positioned-custom-search-cancel-crash.html (0 => 195121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/absolute-positioned-custom-search-cancel-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/absolute-positioned-custom-search-cancel-crash.html 2016-01-15 12:37:36 UTC (rev 195121)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that absolute positioned search/cancel button painting is not crashing</title>
+<style>
+#test {
+ border: 1px solid red;
+ padding-right: 20px;
+ padding-left: 50px;
+ -webkit-appearance: none;
+}
+
+#test::-webkit-search-cancel-button {
+ position: absolute;
+}
+</style>
+</head>
+<body>
+PASS if no crash.
+<input id="test" type="search">
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ document.getElementById("test").value = "foobar";
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195120 => 195121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-15 12:37:09 UTC (rev 195120)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-15 12:37:36 UTC (rev 195121)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-01-08 Zalan Bujtas <zalan@apple.com>
+
+ Absolute positioning -webkit-search-cancel-button crashes Safari.
+ https://bugs.webkit.org/show_bug.cgi?id=152847
+ <rdar://problem/24112087>
+
+ Reviewed by Simon Fraser.
+
+ Do not call offsetFromContainer while resolving the painting position for the search/cancel button renderer.
+ It skips the static positioned parent input renderer, when the search/cancel renderer is absolute positioned.
+ This patch also fixes a rendering glitch when the margin-right is > 0.
+
+ Test: fast/forms/absolute-positioned-custom-search-cancel-crash.html
+
+ * rendering/RenderTheme.h:
+ (WebCore::RenderTheme::paintSearchFieldCancelButton):
+ (WebCore::RenderTheme::paintSearchFieldResultsDecorationPart):
+ (WebCore::RenderTheme::paintSearchFieldResultsButton):
+ * rendering/RenderThemeMac.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::convertToPaintingPosition):
+ (WebCore::RenderThemeMac::paintSearchFieldCancelButton):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsDecorationPart):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsButton):
+ (WebCore::RenderThemeMac::convertToPaintingRect): Deleted.
+
</ins><span class="cx"> 2015-12-22 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Everything broken in GTK+ 3.19
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderTheme.h (195120 => 195121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderTheme.h 2016-01-15 12:37:09 UTC (rev 195120)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderTheme.h 2016-01-15 12:37:36 UTC (rev 195121)
</span><span class="lines">@@ -340,16 +340,16 @@
</span><span class="cx"> virtual bool paintSearchFieldDecorations(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</span><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element*) const;
</span><del>- virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintSearchFieldCancelButton(const RenderBox&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const;
</span><span class="cx"> virtual bool paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</span><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintSearchFieldResultsDecorationPart(const RenderBox&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element*) const;
</span><del>- virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</del><ins>+ virtual bool paintSearchFieldResultsButton(const RenderBox&, const PaintInfo&, const IntRect&) { return true; }
</ins><span class="cx">
</span><span class="cx"> virtual void adjustMediaControlStyle(StyleResolver&, RenderStyle&, Element*) const;
</span><span class="cx"> virtual bool paintMediaFullscreenButton(const RenderObject&, const PaintInfo&, const IntRect&) { return true; }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeGtk.cpp (195120 => 195121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-01-15 12:37:09 UTC (rev 195120)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-01-15 12:37:36 UTC (rev 195121)
</span><span class="lines">@@ -1002,7 +1002,7 @@
</span><span class="cx"> adjustSearchFieldCancelButtonStyle(styleResolver, style, e);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSearchFieldResultsButton(const RenderObject& o, const PaintInfo& i, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintSearchFieldResultsButton(const RenderBox& o, const PaintInfo& i, const IntRect& rect)
</ins><span class="cx"> {
</span><span class="cx"> return paintSearchFieldResultsDecorationPart(o, i, rect);
</span><span class="cx"> }
</span><span class="lines">@@ -1053,7 +1053,7 @@
</span><span class="cx"> return scaledRect;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSearchFieldResultsDecorationPart(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintSearchFieldResultsDecorationPart(const RenderBox& 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 class="lines">@@ -1072,7 +1072,7 @@
</span><span class="cx"> adjustSearchFieldIconStyle(style);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintSearchFieldCancelButton(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</del><ins>+bool RenderThemeGtk::paintSearchFieldCancelButton(const RenderBox& 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="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeGtkh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeGtk.h (195120 => 195121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeGtk.h 2016-01-15 12:37:09 UTC (rev 195120)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeGtk.h 2016-01-15 12:37:36 UTC (rev 195121)
</span><span class="lines">@@ -133,16 +133,16 @@
</span><span class="cx"> virtual bool paintMenuListButtonDecorations(const RenderBox&, const PaintInfo&, const FloatRect&) override;
</span><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span><del>- virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintSearchFieldResultsDecorationPart(const RenderBox&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span><span class="cx"> virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&) override;
</span><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span><del>- virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintSearchFieldResultsButton(const RenderBox&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span><del>- virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintSearchFieldCancelButton(const RenderBox&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool paintSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
</span><span class="cx"> virtual void adjustSliderTrackStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeMach"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeMac.h (195120 => 195121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeMac.h 2016-01-15 12:37:09 UTC (rev 195120)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeMac.h 2016-01-15 12:37:36 UTC (rev 195121)
</span><span class="lines">@@ -147,16 +147,16 @@
</span><span class="cx"> virtual void adjustSearchFieldStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span><del>- virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintSearchFieldCancelButton(const RenderBox&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span><span class="cx"> virtual bool paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override;
</span><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span><del>- virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintSearchFieldResultsDecorationPart(const RenderBox&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span><del>- virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintSearchFieldResultsButton(const RenderBox&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> virtual bool supportsClosedCaptioning() const override { return true; }
</span><span class="lines">@@ -175,8 +175,6 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual String fileListNameForWidth(const FileList*, const FontCascade&, int width, bool multipleFilesAllowed) const override;
</span><span class="cx">
</span><del>- FloatRect convertToPaintingRect(const RenderObject& inputRenderer, const RenderObject& partRenderer, const FloatRect& inputRect, const IntRect&) const;
-
</del><span class="cx"> virtual Color systemColor(CSSValueID) const override;
</span><span class="cx">
</span><span class="cx"> // Get the control size based off the font. Used by some of the controls (like buttons).
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeWincpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeWin.cpp (195120 => 195121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeWin.cpp 2016-01-15 12:37:09 UTC (rev 195120)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeWin.cpp 2016-01-15 12:37:36 UTC (rev 195121)
</span><span class="lines">@@ -872,7 +872,7 @@
</span><span class="cx"> style.setOutlineOffset(-2);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintSearchFieldCancelButton(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintSearchFieldCancelButton(const RenderBox& 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 class="lines">@@ -921,7 +921,7 @@
</span><span class="cx"> style.setHeight(Length(magnifierSize, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintSearchFieldResultsDecorationPart(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintSearchFieldResultsDecorationPart(const RenderBox& 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 class="lines">@@ -954,7 +954,7 @@
</span><span class="cx"> style.setHeight(Length(magnifierHeight, Fixed));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeWin::paintSearchFieldResultsButton(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
</del><ins>+bool RenderThemeWin::paintSearchFieldResultsButton(const RenderBox& 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="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderThemeWinh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeWin.h (195120 => 195121)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeWin.h 2016-01-15 12:37:09 UTC (rev 195120)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderThemeWin.h 2016-01-15 12:37:36 UTC (rev 195121)
</span><span class="lines">@@ -99,16 +99,16 @@
</span><span class="cx"> virtual bool paintSearchField(const RenderObject&, const PaintInfo&, const IntRect&) override;
</span><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldCancelButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span><del>- virtual bool paintSearchFieldCancelButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintSearchFieldCancelButton(const RenderBox&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span><span class="cx"> virtual bool paintSearchFieldDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override { return false; }
</span><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsDecorationPartStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span><del>- virtual bool paintSearchFieldResultsDecorationPart(const RenderObject&, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintSearchFieldResultsDecorationPart(const RenderBox&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void adjustSearchFieldResultsButtonStyle(StyleResolver&, RenderStyle&, Element*) const override;
</span><del>- virtual bool paintSearchFieldResultsButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</del><ins>+ virtual bool paintSearchFieldResultsButton(const RenderBox&, const PaintInfo&, const IntRect&) override;
</ins><span class="cx">
</span><span class="cx"> virtual void themeChanged() override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>