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

Unified Diff: Source/core/layout/LayoutBR.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/LayoutApplet.h ('k') | Source/core/layout/LayoutBlock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutBR.h
diff --git a/Source/core/layout/LayoutBR.h b/Source/core/layout/LayoutBR.h
index ba362bbf9deace31e296774418c1ca56bf84eeeb..4074342d9e4a80d928517a814a4f76eed6b6913d 100644
--- a/Source/core/layout/LayoutBR.h
+++ b/Source/core/layout/LayoutBR.h
@@ -32,27 +32,27 @@ namespace blink {
class LayoutBR final : public LayoutText {
public:
explicit LayoutBR(Node*);
- virtual ~LayoutBR();
+ ~LayoutBR() override;
- virtual const char* name() const override { return "LayoutBR"; }
+ const char* name() const override { return "LayoutBR"; }
- virtual LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* /* paintInvalidationContainer */) const override { return LayoutRect(); }
+ LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* /* paintInvalidationContainer */) const override { return LayoutRect(); }
- virtual float width(unsigned /* from */, unsigned /* len */, const Font&, LayoutUnit /* xpos */, TextDirection, HashSet<const SimpleFontData*>* = nullptr /* fallbackFonts */ , FloatRect* /* glyphBounds */ = nullptr) const override { return 0; }
- virtual float width(unsigned /* from */, unsigned /* len */, LayoutUnit /* xpos */, TextDirection, bool = false /* firstLine */, HashSet<const SimpleFontData*>* = nullptr /* fallbackFonts */, FloatRect* /* glyphBounds */ = nullptr) const override { return 0; }
+ float width(unsigned /* from */, unsigned /* len */, const Font&, LayoutUnit /* xpos */, TextDirection, HashSet<const SimpleFontData*>* = nullptr /* fallbackFonts */ , FloatRect* /* glyphBounds */ = nullptr) const override { return 0; }
+ float width(unsigned /* from */, unsigned /* len */, LayoutUnit /* xpos */, TextDirection, bool = false /* firstLine */, HashSet<const SimpleFontData*>* = nullptr /* fallbackFonts */, FloatRect* /* glyphBounds */ = nullptr) const override { return 0; }
int lineHeight(bool firstLine) const;
// overrides
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectBr || LayoutText::isOfType(type); }
+ bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectBr || LayoutText::isOfType(type); }
- virtual int caretMinOffset() const override;
- virtual int caretMaxOffset() const override;
+ int caretMinOffset() const override;
+ int caretMaxOffset() const override;
- virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override final;
+ PositionWithAffinity positionForPoint(const LayoutPoint&) final;
protected:
- virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
+ void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
};
DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBR, isBR());
« no previous file with comments | « Source/core/layout/LayoutApplet.h ('k') | Source/core/layout/LayoutBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698