<!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>[191082] 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/191082">191082</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-10-14 21:47:44 -0700 (Wed, 14 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Give subclasses of CSSImageGeneratorValue a consistent image() return type
https://bugs.webkit.org/show_bug.cgi?id=150111
Reviewed by Andreas Kling.
CSSImageGeneratorValue and subclasses had signatures of the non-virtual image() function
with mistmatched return types; some returned RefPtr<Image>, and others PassRefPtr<Image>. Make
them all the same.
* css/CSSImageGeneratorValue.cpp:
(WebCore::CSSImageGeneratorValue::image):
* css/CSSImageGeneratorValue.h:
* css/CSSNamedImageValue.cpp:
(WebCore::CSSNamedImageValue::image):
* css/CSSNamedImageValue.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageGeneratorValuecpp">trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageGeneratorValueh">trunk/Source/WebCore/css/CSSImageGeneratorValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSNamedImageValuecpp">trunk/Source/WebCore/css/CSSNamedImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSNamedImageValueh">trunk/Source/WebCore/css/CSSNamedImageValue.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191081 => 191082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-15 03:53:49 UTC (rev 191081)
+++ trunk/Source/WebCore/ChangeLog 2015-10-15 04:47:44 UTC (rev 191082)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-10-14 Simon Fraser <simon.fraser@apple.com>
+
+ Give subclasses of CSSImageGeneratorValue a consistent image() return type
+ https://bugs.webkit.org/show_bug.cgi?id=150111
+
+ Reviewed by Andreas Kling.
+
+ CSSImageGeneratorValue and subclasses had signatures of the non-virtual image() function
+ with mistmatched return types; some returned RefPtr<Image>, and others PassRefPtr<Image>. Make
+ them all the same.
+
+ * css/CSSImageGeneratorValue.cpp:
+ (WebCore::CSSImageGeneratorValue::image):
+ * css/CSSImageGeneratorValue.h:
+ * css/CSSNamedImageValue.cpp:
+ (WebCore::CSSNamedImageValue::image):
+ * css/CSSNamedImageValue.h:
+
</ins><span class="cx"> 2015-10-14 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Move some EventHandler initialization to the header
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageGeneratorValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp (191081 => 191082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp 2015-10-15 03:53:49 UTC (rev 191081)
+++ trunk/Source/WebCore/css/CSSImageGeneratorValue.cpp 2015-10-15 04:47:44 UTC (rev 191082)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> m_owner.evictCachedGeneratedImage(m_size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Image> CSSImageGeneratorValue::image(RenderElement* renderer, const FloatSize& size)
</del><ins>+RefPtr<Image> CSSImageGeneratorValue::image(RenderElement* renderer, const FloatSize& size)
</ins><span class="cx"> {
</span><span class="cx"> switch (classType()) {
</span><span class="cx"> case CanvasClass:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageGeneratorValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageGeneratorValue.h (191081 => 191082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageGeneratorValue.h 2015-10-15 03:53:49 UTC (rev 191081)
+++ trunk/Source/WebCore/css/CSSImageGeneratorValue.h 2015-10-15 04:47:44 UTC (rev 191082)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> void addClient(RenderElement*);
</span><span class="cx"> void removeClient(RenderElement*);
</span><span class="cx">
</span><del>- PassRefPtr<Image> image(RenderElement*, const FloatSize&);
</del><ins>+ RefPtr<Image> image(RenderElement*, const FloatSize&);
</ins><span class="cx">
</span><span class="cx"> bool isFixedSize() const;
</span><span class="cx"> FloatSize fixedSize(const RenderElement*);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSNamedImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSNamedImageValue.cpp (191081 => 191082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSNamedImageValue.cpp 2015-10-15 03:53:49 UTC (rev 191081)
+++ trunk/Source/WebCore/css/CSSNamedImageValue.cpp 2015-10-15 04:47:44 UTC (rev 191082)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> return makeString("-webkit-named-image(", m_name, ')');
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Image> CSSNamedImageValue::image(RenderElement*, const FloatSize& size)
</del><ins>+RefPtr<Image> CSSNamedImageValue::image(RenderElement*, const FloatSize& size)
</ins><span class="cx"> {
</span><span class="cx"> if (size.isEmpty())
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSNamedImageValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSNamedImageValue.h (191081 => 191082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSNamedImageValue.h 2015-10-15 03:53:49 UTC (rev 191081)
+++ trunk/Source/WebCore/css/CSSNamedImageValue.h 2015-10-15 04:47:44 UTC (rev 191082)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> bool isFixedSize() const { return false; }
</span><span class="cx"> bool isPending() const { return false; }
</span><span class="cx">
</span><del>- PassRefPtr<Image> image(RenderElement*, const FloatSize&);
</del><ins>+ RefPtr<Image> image(RenderElement*, const FloatSize&);
</ins><span class="cx">
</span><span class="cx"> bool equals(const CSSNamedImageValue&) const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>