<!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>[191083] 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/191083">191083</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-10-14 21:55:08 -0700 (Wed, 14 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use RefPtr<Image> return type for StyleImage::image()
https://bugs.webkit.org/show_bug.cgi?id=150112
Reviewed by Andreas Kling.
Change StyleImage::image() and subclasses to return RefPtr<Image>
instead of a PassRefPtr<Image>.
* WebCore.xcodeproj/project.pbxproj:
* rendering/RenderImageResource.cpp:
(WebCore::RenderImageResource::image):
* rendering/RenderImageResource.h:
* rendering/RenderImageResourceStyleImage.cpp:
(WebCore::RenderImageResourceStyleImage::image):
* rendering/RenderImageResourceStyleImage.h:
* rendering/style/StyleCachedImage.cpp:
(WebCore::StyleCachedImage::image):
* rendering/style/StyleCachedImage.h:
* rendering/style/StyleCachedImageSet.cpp:
(WebCore::StyleCachedImageSet::image):
* rendering/style/StyleCachedImageSet.h:
* rendering/style/StyleGeneratedImage.cpp:
(WebCore::StyleGeneratedImage::image):
* rendering/style/StyleGeneratedImage.h:
* rendering/style/StyleImage.h:
* rendering/style/StylePendingImage.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImageResourcecpp">trunk/Source/WebCore/rendering/RenderImageResource.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImageResourceh">trunk/Source/WebCore/rendering/RenderImageResource.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImageResourceStyleImagecpp">trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImageResourceStyleImageh">trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleCachedImagecpp">trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleCachedImageh">trunk/Source/WebCore/rendering/style/StyleCachedImage.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleCachedImageSetcpp">trunk/Source/WebCore/rendering/style/StyleCachedImageSet.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleCachedImageSeth">trunk/Source/WebCore/rendering/style/StyleCachedImageSet.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleGeneratedImagecpp">trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleGeneratedImageh">trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleImageh">trunk/Source/WebCore/rendering/style/StyleImage.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStylePendingImageh">trunk/Source/WebCore/rendering/style/StylePendingImage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/ChangeLog 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2015-10-14 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Use RefPtr<Image> return type for StyleImage::image()
+ https://bugs.webkit.org/show_bug.cgi?id=150112
+
+ Reviewed by Andreas Kling.
+
+ Change StyleImage::image() and subclasses to return RefPtr<Image>
+ instead of a PassRefPtr<Image>.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * rendering/RenderImageResource.cpp:
+ (WebCore::RenderImageResource::image):
+ * rendering/RenderImageResource.h:
+ * rendering/RenderImageResourceStyleImage.cpp:
+ (WebCore::RenderImageResourceStyleImage::image):
+ * rendering/RenderImageResourceStyleImage.h:
+ * rendering/style/StyleCachedImage.cpp:
+ (WebCore::StyleCachedImage::image):
+ * rendering/style/StyleCachedImage.h:
+ * rendering/style/StyleCachedImageSet.cpp:
+ (WebCore::StyleCachedImageSet::image):
+ * rendering/style/StyleCachedImageSet.h:
+ * rendering/style/StyleGeneratedImage.cpp:
+ (WebCore::StyleGeneratedImage::image):
+ * rendering/style/StyleGeneratedImage.h:
+ * rendering/style/StyleImage.h:
+ * rendering/style/StylePendingImage.h:
+
+2015-10-14 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Give subclasses of CSSImageGeneratorValue a consistent image() return type
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150111
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -527,6 +527,7 @@
</span><span class="cx"> 0F97A658155DA81E00FADD4C /* DisplayRefreshMonitorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F97A657155DA81E00FADD4C /* DisplayRefreshMonitorIOS.mm */; };
</span><span class="cx"> 0FA24D79162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FA24D77162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp */; };
</span><span class="cx"> 0FA24D7A162DF91900A3F4C0 /* GraphicsLayerUpdater.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FA24D78162DF91900A3F4C0 /* GraphicsLayerUpdater.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 0FA6F96F1BCF614A0031EE70 /* StylePendingImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FA6F96E1BCF614A0031EE70 /* StylePendingImage.h */; };
</ins><span class="cx"> 0FA88EBD16A8D1BD00F99984 /* ScrollingStateFrameScrollingNodeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FA88EBC16A8D1BD00F99984 /* ScrollingStateFrameScrollingNodeMac.mm */; };
</span><span class="cx"> 0FB6252E18DE1B1500A07C05 /* GeometryUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FB6252C18DE1B1500A07C05 /* GeometryUtilities.cpp */; };
</span><span class="cx"> 0FB6252F18DE1B1500A07C05 /* GeometryUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB6252D18DE1B1500A07C05 /* GeometryUtilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -1491,7 +1492,7 @@
</span><span class="cx"> 4129DF861BB5B80C00322A16 /* JSReadableStreamPrivateConstructors.h in Headers */ = {isa = PBXBuildFile; fileRef = 4129DF841BB5B7F700322A16 /* JSReadableStreamPrivateConstructors.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 4138D3351244054800323D33 /* EventContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 4138D3331244054800323D33 /* EventContext.h */; };
</span><span class="cx"> 4138D3361244054800323D33 /* EventContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4138D3341244054800323D33 /* EventContext.cpp */; };
</span><del>- 413C2C341BC29A8F0075204C /* JSDOMConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = 413C2C331BC29A7B0075204C /* JSDOMConstructor.h */; settings = {ASSET_TAGS = (); }; };
</del><ins>+ 413C2C341BC29A8F0075204C /* JSDOMConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = 413C2C331BC29A7B0075204C /* JSDOMConstructor.h */; };
</ins><span class="cx"> 415071571685067300C3C7B3 /* SelectorFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 415071551685067300C3C7B3 /* SelectorFilter.cpp */; };
</span><span class="cx"> 415071581685067300C3C7B3 /* SelectorFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = 415071561685067300C3C7B3 /* SelectorFilter.h */; };
</span><span class="cx"> 4150F9F112B6E0E70008C860 /* SliderThumbElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 4150F9EF12B6E0E70008C860 /* SliderThumbElement.h */; };
</span><span class="lines">@@ -1524,9 +1525,9 @@
</span><span class="cx"> 419BC2DE1685329900D64D6D /* VisitedLinkState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419BC2DC1685329900D64D6D /* VisitedLinkState.cpp */; };
</span><span class="cx"> 419BC2DF1685329900D64D6D /* VisitedLinkState.h in Headers */ = {isa = PBXBuildFile; fileRef = 419BC2DD1685329900D64D6D /* VisitedLinkState.h */; };
</span><span class="cx"> 419BE7561BC7F41B00E1C85B /* WebCoreJSBuiltinInternals.h in Headers */ = {isa = PBXBuildFile; fileRef = 419BE7531BC7F3DB00E1C85B /* WebCoreJSBuiltinInternals.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 419BE7571BC7F42100E1C85B /* WebCoreJSBuiltins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419BE7541BC7F3DB00E1C85B /* WebCoreJSBuiltins.cpp */; settings = {ASSET_TAGS = (); }; };
- 419BE7581BC7F42700E1C85B /* WebCoreJSBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 419BE7551BC7F3DB00E1C85B /* WebCoreJSBuiltins.h */; settings = {ASSET_TAGS = (); }; };
- 419BE7591BC7F42B00E1C85B /* WebCoreBuiltinNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 419BE7521BC7F3DB00E1C85B /* WebCoreBuiltinNames.h */; settings = {ASSET_TAGS = (); }; };
</del><ins>+ 419BE7571BC7F42100E1C85B /* WebCoreJSBuiltins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 419BE7541BC7F3DB00E1C85B /* WebCoreJSBuiltins.cpp */; };
+ 419BE7581BC7F42700E1C85B /* WebCoreJSBuiltins.h in Headers */ = {isa = PBXBuildFile; fileRef = 419BE7551BC7F3DB00E1C85B /* WebCoreJSBuiltins.h */; };
+ 419BE7591BC7F42B00E1C85B /* WebCoreBuiltinNames.h in Headers */ = {isa = PBXBuildFile; fileRef = 419BE7521BC7F3DB00E1C85B /* WebCoreBuiltinNames.h */; };
</ins><span class="cx"> 41A3D58E101C152D00316D07 /* DedicatedWorkerThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41A3D58C101C152D00316D07 /* DedicatedWorkerThread.cpp */; };
</span><span class="cx"> 41A3D58F101C152D00316D07 /* DedicatedWorkerThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 41A3D58D101C152D00316D07 /* DedicatedWorkerThread.h */; };
</span><span class="cx"> 41BF700C0FE86F49005E8DEC /* MessagePortChannel.h in Headers */ = {isa = PBXBuildFile; fileRef = 41BF700A0FE86F49005E8DEC /* MessagePortChannel.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -6371,8 +6372,8 @@
</span><span class="cx"> E1FF8F681807460800132674 /* JSSubtleCryptoCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF8F661807460800132674 /* JSSubtleCryptoCustom.cpp */; };
</span><span class="cx"> E1FF8F6C180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1FF8F6A180DB5BE00132674 /* CryptoAlgorithmRegistry.cpp */; };
</span><span class="cx"> E1FF8F6D180DB5BE00132674 /* CryptoAlgorithmRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = E1FF8F6B180DB5BE00132674 /* CryptoAlgorithmRegistry.h */; };
</span><del>- E38838981BAD145F00D62EE3 /* JSModuleLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38838941BAD145F00D62EE3 /* JSModuleLoader.cpp */; settings = {ASSET_TAGS = (); }; };
- E38838991BAD145F00D62EE3 /* JSModuleLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E38838951BAD145F00D62EE3 /* JSModuleLoader.h */; settings = {ASSET_TAGS = (); }; };
</del><ins>+ E38838981BAD145F00D62EE3 /* JSModuleLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38838941BAD145F00D62EE3 /* JSModuleLoader.cpp */; };
+ E38838991BAD145F00D62EE3 /* JSModuleLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = E38838951BAD145F00D62EE3 /* JSModuleLoader.h */; };
</ins><span class="cx"> E401C27517CE53EC00C41A35 /* ElementIteratorAssertions.h in Headers */ = {isa = PBXBuildFile; fileRef = E401C27417CE53EC00C41A35 /* ElementIteratorAssertions.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> E424A39E1330DF0100CF6DC9 /* LegacyTileGridTile.h in Headers */ = {isa = PBXBuildFile; fileRef = E424A39D1330DF0100CF6DC9 /* LegacyTileGridTile.h */; };
</span><span class="cx"> E424A3A01330DF1E00CF6DC9 /* LegacyTileGridTile.mm in Sources */ = {isa = PBXBuildFile; fileRef = E424A39F1330DF1E00CF6DC9 /* LegacyTileGridTile.mm */; };
</span><span class="lines">@@ -6421,8 +6422,8 @@
</span><span class="cx"> E44B4BB3141650D7002B1D8B /* SelectorChecker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E44B4BB1141650D7002B1D8B /* SelectorChecker.cpp */; };
</span><span class="cx"> E44B4BB4141650D7002B1D8B /* SelectorChecker.h in Headers */ = {isa = PBXBuildFile; fileRef = E44B4BB2141650D7002B1D8B /* SelectorChecker.h */; };
</span><span class="cx"> E44EE3A817577EBD00EEE8CF /* FontGenericFamilies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E44EE3A617576E5500EEE8CF /* FontGenericFamilies.cpp */; };
</span><del>- E44FA1851BCA6B5A0091B6EF /* ComposedTreeIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E44FA1841BCA6B5A0091B6EF /* ComposedTreeIterator.h */; settings = {ASSET_TAGS = (); }; };
- E44FA1871BCA91560091B6EF /* ComposedTreeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E44FA1861BCA91560091B6EF /* ComposedTreeIterator.cpp */; settings = {ASSET_TAGS = (); }; };
</del><ins>+ E44FA1851BCA6B5A0091B6EF /* ComposedTreeIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E44FA1841BCA6B5A0091B6EF /* ComposedTreeIterator.h */; };
+ E44FA1871BCA91560091B6EF /* ComposedTreeIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E44FA1861BCA91560091B6EF /* ComposedTreeIterator.cpp */; };
</ins><span class="cx"> E45322AB140CE267005A0F92 /* SelectorQuery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E45322A9140CE267005A0F92 /* SelectorQuery.cpp */; };
</span><span class="cx"> E45322AC140CE267005A0F92 /* SelectorQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = E45322AA140CE267005A0F92 /* SelectorQuery.h */; };
</span><span class="cx"> E453901D0EAFCACA003695C8 /* MIMETypeRegistryIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45390180EAFCACA003695C8 /* MIMETypeRegistryIOS.mm */; };
</span><span class="lines">@@ -7748,6 +7749,7 @@
</span><span class="cx"> 0F97A657155DA81E00FADD4C /* DisplayRefreshMonitorIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DisplayRefreshMonitorIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 0FA24D77162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsLayerUpdater.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FA24D78162DF91900A3F4C0 /* GraphicsLayerUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicsLayerUpdater.h; sourceTree = "<group>"; };
</span><ins>+ 0FA6F96E1BCF614A0031EE70 /* StylePendingImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StylePendingImage.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0FA88EBC16A8D1BD00F99984 /* ScrollingStateFrameScrollingNodeMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingStateFrameScrollingNodeMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 0FB6252C18DE1B1500A07C05 /* GeometryUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeometryUtilities.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FB6252D18DE1B1500A07C05 /* GeometryUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeometryUtilities.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -22004,6 +22006,7 @@
</span><span class="cx"> BC5EB7280E81DE8100B25965 /* StyleMarqueeData.h */,
</span><span class="cx"> BC5EB74B0E81E06700B25965 /* StyleMultiColData.cpp */,
</span><span class="cx"> BC5EB74C0E81E06700B25965 /* StyleMultiColData.h */,
</span><ins>+ 0FA6F96E1BCF614A0031EE70 /* StylePendingImage.h */,
</ins><span class="cx"> BC2272E10E82EE9B00E7F975 /* StyleRareInheritedData.cpp */,
</span><span class="cx"> BC2272E20E82EE9B00E7F975 /* StyleRareInheritedData.h */,
</span><span class="cx"> BC2272BA0E82EAAE00E7F975 /* StyleRareNonInheritedData.cpp */,
</span><span class="lines">@@ -27858,6 +27861,7 @@
</span><span class="cx"> F34742E91343635000531BC2 /* WorkerScriptDebugServer.h in Headers */,
</span><span class="cx"> A7D6B3490F61104500B79FD1 /* WorkerScriptLoader.h in Headers */,
</span><span class="cx"> 2EA768040FE7126400AB9C8A /* WorkerScriptLoaderClient.h in Headers */,
</span><ins>+ 0FA6F96F1BCF614A0031EE70 /* StylePendingImage.h in Headers */,
</ins><span class="cx"> 2E4346550F546A8200B0F1BA /* WorkerThread.h in Headers */,
</span><span class="cx"> 0B9056F90F2685F30095FF6A /* WorkerThreadableLoader.h in Headers */,
</span><span class="cx"> 97AABD2D14FA09D5007457AE /* WorkerThreadableWebSocketChannel.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImageResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImageResource.cpp (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImageResource.cpp 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/rendering/RenderImageResource.cpp 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> m_renderer->repaint();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Image> RenderImageResource::image(int, int) const
</del><ins>+RefPtr<Image> RenderImageResource::image(int, int) const
</ins><span class="cx"> {
</span><span class="cx"> return m_cachedImage ? m_cachedImage->imageForRenderer(m_renderer) : Image::nullImage();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImageResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImageResource.h (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImageResource.h 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/rendering/RenderImageResource.h 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> void resetAnimation();
</span><span class="cx">
</span><del>- virtual PassRefPtr<Image> image(int width = 0, int height = 0) const;
</del><ins>+ virtual RefPtr<Image> image(int width = 0, int height = 0) const;
</ins><span class="cx"> virtual bool errorOccurred() const;
</span><span class="cx">
</span><span class="cx"> virtual void setContainerSizeForRenderer(const IntSize&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImageResourceStyleImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.cpp (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.cpp 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.cpp 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> m_cachedImage = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Image> RenderImageResourceStyleImage::image(int width, int height) const
</del><ins>+RefPtr<Image> RenderImageResourceStyleImage::image(int width, int height) const
</ins><span class="cx"> {
</span><span class="cx"> // Generated content may trigger calls to image() while we're still pending, don't assert but gracefully exit.
</span><span class="cx"> if (m_styleImage->isPendingImage())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImageResourceStyleImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.h (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.h 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/rendering/RenderImageResourceStyleImage.h 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> virtual void shutdown() override;
</span><span class="cx">
</span><span class="cx"> virtual bool hasImage() const override { return true; }
</span><del>- virtual PassRefPtr<Image> image(int width = 0, int height = 0) const override;
</del><ins>+ virtual RefPtr<Image> image(int width = 0, int height = 0) const override;
</ins><span class="cx"> virtual bool errorOccurred() const override { return m_styleImage->errorOccurred(); }
</span><span class="cx">
</span><span class="cx"> virtual void setContainerSizeForRenderer(const IntSize&) override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> m_image->removeClient(renderer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Image> StyleCachedImage::image(RenderElement* renderer, const FloatSize&) const
</del><ins>+RefPtr<Image> StyleCachedImage::image(RenderElement* renderer, const FloatSize&) const
</ins><span class="cx"> {
</span><span class="cx"> return m_image->imageForRenderer(renderer);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleCachedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleCachedImage.h (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleCachedImage.h 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/rendering/style/StyleCachedImage.h 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> virtual void setContainerSizeForRenderer(const RenderElement*, const FloatSize&, float) override;
</span><span class="cx"> virtual void addClient(RenderElement*) override;
</span><span class="cx"> virtual void removeClient(RenderElement*) override;
</span><del>- virtual PassRefPtr<Image> image(RenderElement*, const FloatSize&) const override;
</del><ins>+ virtual RefPtr<Image> image(RenderElement*, const FloatSize&) const override;
</ins><span class="cx"> virtual bool knownToBeOpaque(const RenderElement*) const override;
</span><span class="cx">
</span><span class="cx"> explicit StyleCachedImage(CachedImage*);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleCachedImageSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleCachedImageSet.cpp (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleCachedImageSet.cpp 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/rendering/style/StyleCachedImageSet.cpp 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> m_bestFitImage->removeClient(renderer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Image> StyleCachedImageSet::image(RenderElement* renderer, const FloatSize&) const
</del><ins>+RefPtr<Image> StyleCachedImageSet::image(RenderElement* renderer, const FloatSize&) const
</ins><span class="cx"> {
</span><span class="cx"> return m_bestFitImage->imageForRenderer(renderer);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleCachedImageSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleCachedImageSet.h (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleCachedImageSet.h 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/rendering/style/StyleCachedImageSet.h 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> virtual void setContainerSizeForRenderer(const RenderElement*, const FloatSize&, float) override;
</span><span class="cx"> virtual void addClient(RenderElement*) override;
</span><span class="cx"> virtual void removeClient(RenderElement*) override;
</span><del>- virtual PassRefPtr<Image> image(RenderElement*, const FloatSize&) const override;
</del><ins>+ virtual RefPtr<Image> image(RenderElement*, const FloatSize&) const override;
</ins><span class="cx"> virtual float imageScaleFactor() const override { return m_imageScaleFactor; }
</span><span class="cx"> virtual bool knownToBeOpaque(const RenderElement*) const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleGeneratedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/rendering/style/StyleGeneratedImage.cpp 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> m_imageGeneratorValue->removeClient(renderer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Image> StyleGeneratedImage::image(RenderElement* renderer, const FloatSize& size) const
</del><ins>+RefPtr<Image> StyleGeneratedImage::image(RenderElement* renderer, const FloatSize& size) const
</ins><span class="cx"> {
</span><span class="cx"> return const_cast<CSSImageGeneratorValue&>(m_imageGeneratorValue.get()).image(renderer, size);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleGeneratedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/rendering/style/StyleGeneratedImage.h 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> virtual void setContainerSizeForRenderer(const RenderElement*, const FloatSize& containerSize, float) override { m_containerSize = containerSize; }
</span><span class="cx"> virtual void addClient(RenderElement*) override;
</span><span class="cx"> virtual void removeClient(RenderElement*) override;
</span><del>- virtual PassRefPtr<Image> image(RenderElement*, const FloatSize&) const override;
</del><ins>+ virtual RefPtr<Image> image(RenderElement*, const FloatSize&) const override;
</ins><span class="cx"> virtual bool knownToBeOpaque(const RenderElement*) const override;
</span><span class="cx">
</span><span class="cx"> explicit StyleGeneratedImage(Ref<CSSImageGeneratorValue>&&);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleImage.h (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleImage.h 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/rendering/style/StyleImage.h 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> virtual void setContainerSizeForRenderer(const RenderElement*, const FloatSize&, float) = 0;
</span><span class="cx"> virtual void addClient(RenderElement*) = 0;
</span><span class="cx"> virtual void removeClient(RenderElement*) = 0;
</span><del>- virtual PassRefPtr<Image> image(RenderElement*, const FloatSize&) const = 0;
</del><ins>+ virtual RefPtr<Image> image(RenderElement*, const FloatSize&) const = 0;
</ins><span class="cx"> virtual WrappedImagePtr data() const = 0;
</span><span class="cx"> virtual float imageScaleFactor() const { return 1; }
</span><span class="cx"> virtual bool knownToBeOpaque(const RenderElement*) const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStylePendingImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StylePendingImage.h (191082 => 191083)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StylePendingImage.h 2015-10-15 04:47:44 UTC (rev 191082)
+++ trunk/Source/WebCore/rendering/style/StylePendingImage.h 2015-10-15 04:55:08 UTC (rev 191083)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> virtual void addClient(RenderElement*) override { }
</span><span class="cx"> virtual void removeClient(RenderElement*) override { }
</span><span class="cx">
</span><del>- virtual PassRefPtr<Image> image(RenderElement*, const FloatSize&) const override
</del><ins>+ virtual RefPtr<Image> image(RenderElement*, const FloatSize&) const override
</ins><span class="cx"> {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nullptr;
</span></span></pre>
</div>
</div>
</body>
</html>