Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(980)

Unified Diff: Source/core/style/StyleGeneratedImage.h

Issue 1226293002: Fix virtual/override/final usage in Source/core/{animation,css,style}/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/style/StyleFetchedImageSet.h ('k') | Source/core/style/StylePendingImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/style/StyleGeneratedImage.h
diff --git a/Source/core/style/StyleGeneratedImage.h b/Source/core/style/StyleGeneratedImage.h
index ffa5b5ac4a0eef2e04c00f2577eb05a456b1d4f9..3d43e86e8a4dd62f846c88e73654e836f808bcb0 100644
--- a/Source/core/style/StyleGeneratedImage.h
+++ b/Source/core/style/StyleGeneratedImage.h
@@ -39,20 +39,20 @@ public:
return adoptRef(new StyleGeneratedImage(value));
}
- virtual WrappedImagePtr data() const override { return m_imageGeneratorValue.get(); }
+ WrappedImagePtr data() const override { return m_imageGeneratorValue.get(); }
- virtual PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override;
+ PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override;
- virtual LayoutSize imageSize(const LayoutObject*, float multiplier) const override;
- virtual bool imageHasRelativeWidth() const override { return !m_fixedSize; }
- virtual bool imageHasRelativeHeight() const override { return !m_fixedSize; }
- virtual void computeIntrinsicDimensions(const LayoutObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) override;
- virtual bool usesImageContainerSize() const override { return !m_fixedSize; }
- virtual void setContainerSizeForLayoutObject(const LayoutObject*, const IntSize& containerSize, float) override { m_containerSize = containerSize; }
- virtual void addClient(LayoutObject*) override;
- virtual void removeClient(LayoutObject*) override;
- virtual PassRefPtr<Image> image(LayoutObject*, const IntSize&) const override;
- virtual bool knownToBeOpaque(const LayoutObject*) const override;
+ LayoutSize imageSize(const LayoutObject*, float multiplier) const override;
+ bool imageHasRelativeWidth() const override { return !m_fixedSize; }
+ bool imageHasRelativeHeight() const override { return !m_fixedSize; }
+ void computeIntrinsicDimensions(const LayoutObject*, Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) override;
+ bool usesImageContainerSize() const override { return !m_fixedSize; }
+ void setContainerSizeForLayoutObject(const LayoutObject*, const IntSize& containerSize, float) override { m_containerSize = containerSize; }
+ void addClient(LayoutObject*) override;
+ void removeClient(LayoutObject*) override;
+ PassRefPtr<Image> image(LayoutObject*, const IntSize&) const override;
+ bool knownToBeOpaque(const LayoutObject*) const override;
private:
StyleGeneratedImage(PassRefPtrWillBeRawPtr<CSSImageGeneratorValue>);
« no previous file with comments | « Source/core/style/StyleFetchedImageSet.h ('k') | Source/core/style/StylePendingImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698