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

Unified Diff: Source/core/style/StylePendingImage.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/StyleGeneratedImage.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/style/StylePendingImage.h
diff --git a/Source/core/style/StylePendingImage.h b/Source/core/style/StylePendingImage.h
index 8a5153abb987fc0b08af51b1f59e03d1fa435156..6d5e861d85dbf22b311426e7699325dda2433900 100644
--- a/Source/core/style/StylePendingImage.h
+++ b/Source/core/style/StylePendingImage.h
@@ -43,28 +43,28 @@ class StylePendingImage final : public StyleImage {
public:
static PassRefPtr<StylePendingImage> create(CSSValue* value) { return adoptRef(new StylePendingImage(value)); }
- virtual WrappedImagePtr data() const override { return m_value; }
+ WrappedImagePtr data() const override { return m_value; }
- virtual PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override { return m_value; }
+ PassRefPtrWillBeRawPtr<CSSValue> cssValue() const override { return m_value; }
CSSImageValue* cssImageValue() const { return m_value->isImageValue() ? toCSSImageValue(m_value) : 0; }
CSSImageGeneratorValue* cssImageGeneratorValue() const { return m_value->isImageGeneratorValue() ? toCSSImageGeneratorValue(m_value) : 0; }
CSSCursorImageValue* cssCursorImageValue() const { return m_value->isCursorImageValue() ? toCSSCursorImageValue(m_value) : 0; }
CSSImageSetValue* cssImageSetValue() const { return m_value->isImageSetValue() ? toCSSImageSetValue(m_value) : 0; }
- virtual LayoutSize imageSize(const LayoutObject*, float /*multiplier*/) const override { return LayoutSize(); }
- virtual bool imageHasRelativeWidth() const override { return false; }
- virtual bool imageHasRelativeHeight() const override { return false; }
- virtual void computeIntrinsicDimensions(const LayoutObject*, Length& /* intrinsicWidth */ , Length& /* intrinsicHeight */, FloatSize& /* intrinsicRatio */) override { }
- virtual bool usesImageContainerSize() const override { return false; }
- virtual void setContainerSizeForLayoutObject(const LayoutObject*, const IntSize&, float) override { }
- virtual void addClient(LayoutObject*) override { }
- virtual void removeClient(LayoutObject*) override { }
- virtual PassRefPtr<Image> image(LayoutObject*, const IntSize&) const override
+ LayoutSize imageSize(const LayoutObject*, float /*multiplier*/) const override { return LayoutSize(); }
+ bool imageHasRelativeWidth() const override { return false; }
+ bool imageHasRelativeHeight() const override { return false; }
+ void computeIntrinsicDimensions(const LayoutObject*, Length& /* intrinsicWidth */ , Length& /* intrinsicHeight */, FloatSize& /* intrinsicRatio */) override { }
+ bool usesImageContainerSize() const override { return false; }
+ void setContainerSizeForLayoutObject(const LayoutObject*, const IntSize&, float) override { }
+ void addClient(LayoutObject*) override { }
+ void removeClient(LayoutObject*) override { }
+ PassRefPtr<Image> image(LayoutObject*, const IntSize&) const override
{
ASSERT_NOT_REACHED();
return nullptr;
}
- virtual bool knownToBeOpaque(const LayoutObject*) const override { return false; }
+ bool knownToBeOpaque(const LayoutObject*) const override { return false; }
private:
StylePendingImage(CSSValue* value)
« no previous file with comments | « Source/core/style/StyleGeneratedImage.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698