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

Unified Diff: Source/core/rendering/RenderReplaced.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 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/rendering/RenderRegion.h ('k') | Source/core/rendering/RenderReplica.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderReplaced.h
diff --git a/Source/core/rendering/RenderReplaced.h b/Source/core/rendering/RenderReplaced.h
index da93291176a6d62d7001f7228548f87272e812d3..aedff48e905ebc0bc399cb9201c4aae20e53c697 100644
--- a/Source/core/rendering/RenderReplaced.h
+++ b/Source/core/rendering/RenderReplaced.h
@@ -32,44 +32,44 @@ public:
RenderReplaced(Element*, const LayoutSize& intrinsicSize);
virtual ~RenderReplaced();
- virtual LayoutUnit computeReplacedLogicalWidth(ShouldComputePreferred = ComputeActual) const OVERRIDE;
- virtual LayoutUnit computeReplacedLogicalHeight() const OVERRIDE;
+ virtual LayoutUnit computeReplacedLogicalWidth(ShouldComputePreferred = ComputeActual) const override;
+ virtual LayoutUnit computeReplacedLogicalHeight() const override;
bool hasReplacedLogicalHeight() const;
LayoutRect replacedContentRect(const LayoutSize* overriddenIntrinsicSize = 0) const;
- virtual bool needsPreferredWidthsRecalculation() const OVERRIDE;
+ virtual bool needsPreferredWidthsRecalculation() const override;
// These values are specified to be 300 and 150 pixels in the CSS 2.1 spec.
// http://www.w3.org/TR/CSS2/visudet.html#inline-replaced-width
static const int defaultWidth;
static const int defaultHeight;
- virtual bool canHaveChildren() const OVERRIDE { return false; }
+ virtual bool canHaveChildren() const override { return false; }
bool shouldPaint(PaintInfo&, const LayoutPoint&);
virtual void paintReplaced(PaintInfo&, const LayoutPoint&) { }
LayoutRect localSelectionRect(bool checkWhetherSelected = true) const; // This is in local coordinates, but it's a physical rect (so the top left corner is physical top left).
- virtual void paint(PaintInfo&, const LayoutPoint&) OVERRIDE;
+ virtual void paint(PaintInfo&, const LayoutPoint&) override;
protected:
- virtual void willBeDestroyed() OVERRIDE;
+ virtual void willBeDestroyed() override;
- virtual void layout() OVERRIDE;
+ virtual void layout() override;
- virtual LayoutSize intrinsicSize() const OVERRIDE FINAL { return m_intrinsicSize; }
- virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const OVERRIDE;
+ virtual LayoutSize intrinsicSize() const override final { return m_intrinsicSize; }
+ virtual void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const override;
- virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const OVERRIDE FINAL;
+ virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override final;
virtual LayoutUnit intrinsicContentLogicalHeight() const { return intrinsicLogicalHeight(); }
virtual LayoutUnit minimumReplacedHeight() const { return LayoutUnit(); }
- virtual void setSelectionState(SelectionState) OVERRIDE FINAL;
+ virtual void setSelectionState(SelectionState) override final;
bool isSelected() const;
- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
+ virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
void setIntrinsicSize(const LayoutSize& intrinsicSize) { m_intrinsicSize = intrinsicSize; }
virtual void intrinsicSizeChanged();
@@ -77,17 +77,17 @@ protected:
virtual RenderBox* embeddedContentBox() const { return 0; }
private:
- virtual const char* renderName() const OVERRIDE { return "RenderReplaced"; }
+ virtual const char* renderName() const override { return "RenderReplaced"; }
- virtual void computePreferredLogicalWidths() OVERRIDE FINAL;
+ virtual void computePreferredLogicalWidths() override final;
- virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const OVERRIDE;
+ virtual LayoutRect clippedOverflowRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* = 0) const override;
- virtual PositionWithAffinity positionForPoint(const LayoutPoint&) OVERRIDE FINAL;
+ virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override final;
- virtual bool canBeSelectionLeaf() const OVERRIDE { return true; }
+ virtual bool canBeSelectionLeaf() const override { return true; }
- virtual LayoutRect selectionRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer) const OVERRIDE FINAL;
+ virtual LayoutRect selectionRectForPaintInvalidation(const RenderLayerModelObject* paintInvalidationContainer) const override final;
void computeAspectRatioInformationForRenderBox(RenderBox*, FloatSize& constrainedSize, double& intrinsicRatio) const;
mutable LayoutSize m_intrinsicSize;
« no previous file with comments | « Source/core/rendering/RenderRegion.h ('k') | Source/core/rendering/RenderReplica.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698