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