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

Unified Diff: Source/core/svg/graphics/SVGImageForContainer.h

Issue 1212253012: Fix virtual/override/final usage in Source/core/svg/. (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
Index: Source/core/svg/graphics/SVGImageForContainer.h
diff --git a/Source/core/svg/graphics/SVGImageForContainer.h b/Source/core/svg/graphics/SVGImageForContainer.h
index c8a5cf33511e42a3681c741041db4196a2c1864f..54d0c6be4277b06d210bb9322313764cd437dd6d 100644
--- a/Source/core/svg/graphics/SVGImageForContainer.h
+++ b/Source/core/svg/graphics/SVGImageForContainer.h
@@ -41,27 +41,27 @@ public:
return adoptRef(new SVGImageForContainer(image, containerSize, zoom));
}
- virtual bool isSVGImage() const override { return true; }
+ bool isSVGImage() const override { return true; }
- virtual IntSize size() const override;
+ IntSize size() const override;
void setURL(const KURL& url) { m_image->setURL(url); }
- virtual bool usesContainerSize() const override { return m_image->usesContainerSize(); }
- virtual bool hasRelativeWidth() const override { return m_image->hasRelativeWidth(); }
- virtual bool hasRelativeHeight() const override { return m_image->hasRelativeHeight(); }
- virtual void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) override
+ bool usesContainerSize() const override { return m_image->usesContainerSize(); }
+ bool hasRelativeWidth() const override { return m_image->hasRelativeWidth(); }
+ bool hasRelativeHeight() const override { return m_image->hasRelativeHeight(); }
+ void computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio) override
{
m_image->computeIntrinsicDimensions(intrinsicWidth, intrinsicHeight, intrinsicRatio);
}
void draw(SkCanvas*, const SkPaint&, const FloatRect&, const FloatRect&, RespectImageOrientationEnum, ImageClampingMode) override;
- virtual void drawPattern(GraphicsContext*, const FloatRect&, const FloatSize&, const FloatPoint&, SkXfermode::Mode, const FloatRect&, const IntSize& repeatSpacing) override;
+ void drawPattern(GraphicsContext*, const FloatRect&, const FloatSize&, const FloatPoint&, SkXfermode::Mode, const FloatRect&, const IntSize& repeatSpacing) override;
// FIXME: Implement this to be less conservative.
- virtual bool currentFrameKnownToBeOpaque() override { return false; }
+ bool currentFrameKnownToBeOpaque() override { return false; }
- virtual bool bitmapForCurrentFrame(SkBitmap*) override;
+ bool bitmapForCurrentFrame(SkBitmap*) override;
private:
SVGImageForContainer(SVGImage* image, const FloatSize& containerSize, float zoom)
@@ -71,7 +71,7 @@ private:
{
}
- virtual void destroyDecodedData(bool) override { }
+ void destroyDecodedData(bool) override { }
SVGImage* m_image;
const FloatSize m_containerSize;

Powered by Google App Engine
This is Rietveld 408576698