<!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>[194955] 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/194955">194955</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-12 22:47:10 -0800 (Tue, 12 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Fix return value of some paint methods in RenderThemeGtk
https://bugs.webkit.org/show_bug.cgi?id=153015
Reviewed by Michael Catanzaro.
The bool value returned by paint methods in RenderTheme means
whether the appearance is supported or not, so we should return
true when not supported (so we didn't paint anything) and false
when supported (so we actually painted the theme part).
* rendering/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::paintSearchFieldResultsDecorationPart):
(WebCore::RenderThemeGtk::paintSearchFieldCancelButton):
(WebCore::RenderThemeGtk::paintMediaButton):
(WebCore::RenderThemeGtk::paintMediaMuteButton):
(WebCore::RenderThemeGtk::paintMediaPlayButton):
(WebCore::RenderThemeGtk::paintMediaSliderTrack):
(WebCore::RenderThemeGtk::paintMediaVolumeSliderContainer): Deleted.
* rendering/RenderThemeGtk.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194954 => 194955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-13 05:55:33 UTC (rev 194954)
+++ trunk/Source/WebCore/ChangeLog 2016-01-13 06:47:10 UTC (rev 194955)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-01-12 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Fix return value of some paint methods in RenderThemeGtk
+ https://bugs.webkit.org/show_bug.cgi?id=153015
+
+ Reviewed by Michael Catanzaro.
+
+ The bool value returned by paint methods in RenderTheme means
+ whether the appearance is supported or not, so we should return
+ true when not supported (so we didn't paint anything) and false
+ when supported (so we actually painted the theme part).
+
+ * rendering/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::paintSearchFieldResultsDecorationPart):
+ (WebCore::RenderThemeGtk::paintSearchFieldCancelButton):
+ (WebCore::RenderThemeGtk::paintMediaButton):
+ (WebCore::RenderThemeGtk::paintMediaMuteButton):
+ (WebCore::RenderThemeGtk::paintMediaPlayButton):
+ (WebCore::RenderThemeGtk::paintMediaSliderTrack):
+ (WebCore::RenderThemeGtk::paintMediaVolumeSliderContainer): Deleted.
+ * rendering/RenderThemeGtk.h:
+
</ins><span class="cx"> 2016-01-12 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [Content Filtering] De-virtualize PlatformContentFilter::{needsMoreData, didBlockData}()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (194954 => 194955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-01-13 05:55:33 UTC (rev 194954)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-01-13 06:47:10 UTC (rev 194955)
</span><span class="lines">@@ -1007,9 +1007,9 @@
</span><span class="cx"> {
</span><span class="cx"> IntRect iconRect = centerRectVerticallyInParentInputElement(renderObject, rect);
</span><span class="cx"> if (iconRect.isEmpty())
</span><del>- return false;
</del><ins>+ return true;
</ins><span class="cx">
</span><del>- return paintEntryIcon(EntryIconLeft, "edit-find-symbolic", paintInfo.context(), iconRect, gtkTextDirection(renderObject.style().direction()),
</del><ins>+ return !paintEntryIcon(EntryIconLeft, "edit-find-symbolic", paintInfo.context(), iconRect, gtkTextDirection(renderObject.style().direction()),
</ins><span class="cx"> gtkIconStateFlags(this, renderObject));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1022,9 +1022,9 @@
</span><span class="cx"> {
</span><span class="cx"> IntRect iconRect = centerRectVerticallyInParentInputElement(renderObject, rect);
</span><span class="cx"> if (iconRect.isEmpty())
</span><del>- return false;
</del><ins>+ return true;
</ins><span class="cx">
</span><del>- return paintEntryIcon(EntryIconRight, "edit-clear-symbolic", paintInfo.context(), iconRect, gtkTextDirection(renderObject.style().direction()),
</del><ins>+ return !paintEntryIcon(EntryIconRight, "edit-clear-symbolic", paintInfo.context(), iconRect, gtkTextDirection(renderObject.style().direction()),
</ins><span class="cx"> gtkIconStateFlags(this, renderObject));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1382,7 +1382,7 @@
</span><span class="cx"> gtk_style_context_set_state(context.get(), gtkIconStateFlags(this, renderObject));
</span><span class="cx"> static const unsigned mediaIconSize = 16;
</span><span class="cx"> IntRect iconRect(rect.x() + (rect.width() - mediaIconSize) / 2, rect.y() + (rect.height() - mediaIconSize) / 2, mediaIconSize, mediaIconSize);
</span><del>- return paintIcon(context.get(), graphicsContext, iconRect, iconName);
</del><ins>+ return !paintIcon(context.get(), graphicsContext, iconRect, iconName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderThemeGtk::hasOwnDisabledStateHandlingFor(ControlPart part) const
</span><span class="lines">@@ -1399,10 +1399,10 @@
</span><span class="cx"> {
</span><span class="cx"> Node* node = renderObject.node();
</span><span class="cx"> if (!node)
</span><del>- return false;
</del><ins>+ return true;
</ins><span class="cx"> Node* mediaNode = node->shadowHost();
</span><span class="cx"> if (!is<HTMLMediaElement>(mediaNode))
</span><del>- return false;
</del><ins>+ return true;
</ins><span class="cx">
</span><span class="cx"> HTMLMediaElement* mediaElement = downcast<HTMLMediaElement>(mediaNode);
</span><span class="cx"> return paintMediaButton(renderObject, paintInfo.context(), rect, mediaElement->muted() ? "audio-volume-muted-symbolic" : "audio-volume-high-symbolic");
</span><span class="lines">@@ -1412,10 +1412,9 @@
</span><span class="cx"> {
</span><span class="cx"> Node* node = renderObject.node();
</span><span class="cx"> if (!node)
</span><del>- return false;
-
</del><ins>+ return true;
</ins><span class="cx"> if (!nodeHasPseudo(node, "-webkit-media-controls-play-button"))
</span><del>- return false;
</del><ins>+ return true;
</ins><span class="cx">
</span><span class="cx"> return paintMediaButton(renderObject, paintInfo.context(), rect, nodeHasClass(node, "paused") ? "media-playback-start-symbolic" : "media-playback-pause-symbolic");
</span><span class="cx"> }
</span><span class="lines">@@ -1450,7 +1449,7 @@
</span><span class="cx"> {
</span><span class="cx"> HTMLMediaElement* mediaElement = parentMediaElement(o);
</span><span class="cx"> if (!mediaElement)
</span><del>- return false;
</del><ins>+ return true;
</ins><span class="cx">
</span><span class="cx"> GraphicsContext& context = paintInfo.context();
</span><span class="cx"> context.save();
</span><span class="lines">@@ -1486,11 +1485,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderThemeGtk::paintMediaVolumeSliderContainer(const RenderObject&, const PaintInfo&, const IntRect&)
-{
- return true;
-}
-
</del><span class="cx"> bool RenderThemeGtk::paintMediaVolumeSliderTrack(const RenderObject& renderObject, const PaintInfo& paintInfo, const IntRect& rect)
</span><span class="cx"> {
</span><span class="cx"> HTMLMediaElement* mediaElement = parentMediaElement(renderObject);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.h (194954 => 194955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.h 2016-01-13 05:55:33 UTC (rev 194954)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.h 2016-01-13 06:47:10 UTC (rev 194955)
</span><span class="lines">@@ -162,7 +162,6 @@
</span><span class="cx"> virtual bool paintMediaSeekForwardButton(const RenderObject&, const PaintInfo&, const IntRect&) override;
</span><span class="cx"> virtual bool paintMediaSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
</span><span class="cx"> virtual bool paintMediaSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) override;
</span><del>- virtual bool paintMediaVolumeSliderContainer(const RenderObject&, const PaintInfo&, const IntRect&) override;
</del><span class="cx"> virtual bool paintMediaVolumeSliderTrack(const RenderObject&, const PaintInfo&, const IntRect&) override;
</span><span class="cx"> virtual bool paintMediaVolumeSliderThumb(const RenderObject&, const PaintInfo&, const IntRect&) override;
</span><span class="cx"> virtual bool paintMediaCurrentTime(const RenderObject&, const PaintInfo&, const IntRect&) override;
</span></span></pre>
</div>
</div>
</body>
</html>