diff options
Diffstat (limited to 'Source/WebCore/rendering/style/StyleCachedImageSet.h')
| -rw-r--r-- | Source/WebCore/rendering/style/StyleCachedImageSet.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/WebCore/rendering/style/StyleCachedImageSet.h b/Source/WebCore/rendering/style/StyleCachedImageSet.h index 24d8330d9..d0ad5c913 100644 --- a/Source/WebCore/rendering/style/StyleCachedImageSet.h +++ b/Source/WebCore/rendering/style/StyleCachedImageSet.h @@ -43,9 +43,9 @@ class CSSImageSetValue; class StyleCachedImageSet final : public StyleImage, private CachedImageClient { WTF_MAKE_FAST_ALLOCATED; public: - static Ref<StyleCachedImageSet> create(CachedImage* image, float imageScaleFactor, CSSImageSetValue* value) + static PassRefPtr<StyleCachedImageSet> create(CachedImage* image, float imageScaleFactor, CSSImageSetValue* value) { - return adoptRef(*new StyleCachedImageSet(image, imageScaleFactor, value)); + return adoptRef(new StyleCachedImageSet(image, imageScaleFactor, value)); } virtual ~StyleCachedImageSet(); @@ -64,15 +64,15 @@ private: virtual bool canRender(const RenderObject*, float multiplier) const override; virtual bool isLoaded() const override; virtual bool errorOccurred() const override; - virtual FloatSize imageSize(const RenderElement*, float multiplier) const override; + virtual LayoutSize imageSize(const RenderElement*, float multiplier) const override; virtual bool imageHasRelativeWidth() const override; virtual bool imageHasRelativeHeight() const override; virtual void computeIntrinsicDimensions(const RenderElement*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) override; virtual bool usesImageContainerSize() const override; - virtual void setContainerSizeForRenderer(const RenderElement*, const FloatSize&, float) override; + virtual void setContainerSizeForRenderer(const RenderElement*, const IntSize&, float) override; virtual void addClient(RenderElement*) override; virtual void removeClient(RenderElement*) override; - virtual RefPtr<Image> image(RenderElement*, const FloatSize&) const override; + virtual PassRefPtr<Image> image(RenderElement*, const IntSize&) const override; virtual float imageScaleFactor() const override { return m_imageScaleFactor; } virtual bool knownToBeOpaque(const RenderElement*) const override; @@ -85,8 +85,6 @@ private: } // namespace WebCore -SPECIALIZE_TYPE_TRAITS_STYLE_IMAGE(StyleCachedImageSet, isCachedImageSet) - #endif // ENABLE(CSS_IMAGE_SET) #endif // StyleCachedImageSet_h |