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

Unified Diff: Source/core/layout/LayoutImage.h

Issue 1231363003: Fix virtual/override/final usage in Source/core/layout/. (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/layout/LayoutIFrame.h ('k') | Source/core/layout/LayoutImageResourceStyleImage.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutImage.h
diff --git a/Source/core/layout/LayoutImage.h b/Source/core/layout/LayoutImage.h
index d0fc8a27b68c8e37662c4c55146a8690aff178ee..ff183a7b2c1b23caf085f1a1138b5946f76ab268 100644
--- a/Source/core/layout/LayoutImage.h
+++ b/Source/core/layout/LayoutImage.h
@@ -41,7 +41,7 @@ public:
static const unsigned short paddingHeight = 4;
LayoutImage(Element*);
- virtual ~LayoutImage();
+ ~LayoutImage() override;
static LayoutImage* createAnonymous(Document*);
@@ -61,46 +61,46 @@ public:
inline void setImageDevicePixelRatio(float factor) { m_imageDevicePixelRatio = factor; }
float imageDevicePixelRatio() const { return m_imageDevicePixelRatio; }
- virtual void intrinsicSizeChanged() override
+ void intrinsicSizeChanged() override
{
if (m_imageResource)
imageChanged(m_imageResource->imagePtr());
}
- virtual const char* name() const override { return "LayoutImage"; }
+ const char* name() const override { return "LayoutImage"; }
protected:
- virtual bool needsPreferredWidthsRecalculation() const override final;
- virtual LayoutBox* embeddedContentBox() const override final;
- virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const override final;
+ bool needsPreferredWidthsRecalculation() const final;
+ LayoutBox* embeddedContentBox() const final;
+ void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const final;
- virtual void imageChanged(WrappedImagePtr, const IntRect* = nullptr) override;
+ void imageChanged(WrappedImagePtr, const IntRect* = nullptr) override;
- virtual void paint(const PaintInfo&, const LayoutPoint&) override final;
+ void paint(const PaintInfo&, const LayoutPoint&) final;
- virtual void layout() override;
- virtual bool updateImageLoadingPriorities() override final;
+ void layout() override;
+ bool updateImageLoadingPriorities() final;
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutImage || LayoutReplaced::isOfType(type); }
+ bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutImage || LayoutReplaced::isOfType(type); }
- virtual void willBeDestroyed() override;
+ void willBeDestroyed() override;
private:
- virtual bool isImage() const override { return true; }
+ bool isImage() const override { return true; }
- virtual void paintReplaced(const PaintInfo&, const LayoutPoint&) override;
+ void paintReplaced(const PaintInfo&, const LayoutPoint&) override;
- virtual bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const override final;
- virtual bool computeBackgroundIsKnownToBeObscured() override final;
+ bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const final;
+ bool computeBackgroundIsKnownToBeObscured() final;
- virtual bool backgroundShouldAlwaysBeClipped() const override { return true; }
+ bool backgroundShouldAlwaysBeClipped() const override { return true; }
- virtual LayoutUnit minimumReplacedHeight() const override;
+ LayoutUnit minimumReplacedHeight() const override;
- virtual void notifyFinished(Resource*) override final;
- virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override final;
+ void notifyFinished(Resource*) final;
+ bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) final;
- virtual bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox*) const override final;
+ bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, InlineFlowBox*) const final;
void invalidatePaintAndMarkForLayoutIfNeeded();
void updateIntrinsicSizeIfNeeded(const LayoutSize&);
« no previous file with comments | « Source/core/layout/LayoutIFrame.h ('k') | Source/core/layout/LayoutImageResourceStyleImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698