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

Unified Diff: Source/core/layout/LayoutMultiColumnSpannerPlaceholder.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/LayoutMultiColumnSet.h ('k') | Source/core/layout/LayoutObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutMultiColumnSpannerPlaceholder.h
diff --git a/Source/core/layout/LayoutMultiColumnSpannerPlaceholder.h b/Source/core/layout/LayoutMultiColumnSpannerPlaceholder.h
index f604173d9b908e1b0af8f162159777910c6f3473..29d49de7f4e35b0520623739940e3edb64a0bf66 100644
--- a/Source/core/layout/LayoutMultiColumnSpannerPlaceholder.h
+++ b/Source/core/layout/LayoutMultiColumnSpannerPlaceholder.h
@@ -15,7 +15,7 @@ namespace blink {
// are siblings of LayoutMultiColumnSet objects, i.e. direct children of the multicol container.
class LayoutMultiColumnSpannerPlaceholder final : public LayoutBox {
public:
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutMultiColumnSpannerPlaceholder || LayoutBox::isOfType(type); }
+ bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectLayoutMultiColumnSpannerPlaceholder || LayoutBox::isOfType(type); }
static LayoutMultiColumnSpannerPlaceholder* createAnonymous(const ComputedStyle& parentStyle, LayoutBox&);
@@ -34,18 +34,18 @@ public:
void layoutObjectInFlowThreadStyleDidChange(const ComputedStyle* oldStyle);
void updateMarginProperties();
- virtual const char* name() const override { return "LayoutMultiColumnSpannerPlaceholder"; }
+ const char* name() const override { return "LayoutMultiColumnSpannerPlaceholder"; }
protected:
- virtual void willBeRemovedFromTree() override;
- virtual bool needsPreferredWidthsRecalculation() const override;
- virtual LayoutUnit minPreferredLogicalWidth() const override;
- virtual LayoutUnit maxPreferredLogicalWidth() const override;
- virtual void layout() override;
- virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
- virtual void invalidateTreeIfNeeded(PaintInvalidationState&) override;
- virtual void paint(const PaintInfo&, const LayoutPoint& paintOffset) override;
- virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
+ void willBeRemovedFromTree() override;
+ bool needsPreferredWidthsRecalculation() const override;
+ LayoutUnit minPreferredLogicalWidth() const override;
+ LayoutUnit maxPreferredLogicalWidth() const override;
+ void layout() override;
+ void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override;
+ void invalidateTreeIfNeeded(PaintInvalidationState&) override;
+ void paint(const PaintInfo&, const LayoutPoint& paintOffset) override;
+ bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override;
private:
LayoutMultiColumnSpannerPlaceholder(LayoutBox*);
« no previous file with comments | « Source/core/layout/LayoutMultiColumnSet.h ('k') | Source/core/layout/LayoutObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698