Fix virtual/override/final usage in Source/core/layout/.

Source/core/layout/LayoutText.h

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004-2009, 2013 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 26 matching lines @@
 class AbstractInlineTextBox;
 class InlineTextBox;
 
 class CORE_EXPORT LayoutText : public LayoutObject {
 public:
     // FIXME: If the node argument is not a Text node or the string argument is
     // not the content of the Text node, updating text-transform property
     // doesn't re-transform the string.
     LayoutText(Node*, PassRefPtr<StringImpl>);
 #if ENABLE(ASSERT)
-    virtual ~LayoutText();
+    ~LayoutText() override;
 #endif
 
-    virtual const char* name() const override { return "LayoutText"; }
+    const char* name() const override { return "LayoutText"; }
 
     virtual bool isTextFragment() const;
     virtual bool isWordBreak() const;
 
     virtual PassRefPtr<StringImpl> originalText() const;
 
     void extractTextBox(InlineTextBox*);
     void attachTextBox(InlineTextBox*);
     void removeTextBox(InlineTextBox*);
 
     const String& text() const { return m_text; }
     virtual unsigned textStartOffset() const { return 0; }
     String plainText() const;
 
     InlineTextBox* createInlineTextBox(int start, unsigned short length);
     void dirtyOrDeleteLineBoxesIfNeeded(bool fullLayout);
     void dirtyLineBoxes();
 
-    virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override final;
+    void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const final;
     void absoluteRectsForRange(Vector<IntRect>&, unsigned startOffset = 0, unsigned endOffset = INT_MAX, bool useSelectionHeight = false, bool* wasFixed = nullptr);
 
-    virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override final;
+    void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const final;
     void absoluteQuadsForRange(Vector<FloatQuad>&, unsigned startOffset = 0, unsigned endOffset = INT_MAX, bool useSelectionHeight = false, bool* wasFixed = nullptr);
 
     enum ClippingOption { NoClipping, ClipToEllipsis };
     void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed = nullptr, ClippingOption = NoClipping) const;
 
-    virtual PositionWithAffinity positionForPoint(const LayoutPoint&) override;
+    PositionWithAffinity positionForPoint(const LayoutPoint&) override;
 
     bool is8Bit() const { return m_text.is8Bit(); }
     const LChar* characters8() const { return m_text.impl()->characters8(); }
     const UChar* characters16() const { return m_text.impl()->characters16(); }
     bool hasEmptyText() const { return m_text.isEmpty(); }
     UChar characterAt(unsigned) const;
     UChar uncheckedCharacterAt(unsigned) const;
     UChar operator[](unsigned i) const { return uncheckedCharacterAt(i); }
     unsigned textLength() const { return m_text.length(); } // non virtual implementation of length()
     void positionLineBox(InlineBox*);
@@ skipping 17 matching lines @@
 
     FloatPoint firstRunOrigin() const;
     float firstRunX() const;
     float firstRunY() const;
 
     virtual void setText(PassRefPtr<StringImpl>, bool force = false);
     void setTextWithOffset(PassRefPtr<StringImpl>, unsigned offset, unsigned len, bool force = false);
 
     virtual void transformText();
 
-    virtual bool canBeSelectionLeaf() const override { return true; }
-    virtual void setSelectionState(SelectionState) override final;
-    virtual LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer) const override;
-    virtual LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = nullptr) override;
+    bool canBeSelectionLeaf() const override { return true; }
+    void setSelectionState(SelectionState) final;
+    LayoutRect selectionRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer) const override;
+    LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = nullptr) override;
 
     InlineTextBox* firstTextBox() const { return m_firstTextBox; }
     InlineTextBox* lastTextBox() const { return m_lastTextBox; }
 
-    virtual int caretMinOffset() const override;
-    virtual int caretMaxOffset() const override;
+    int caretMinOffset() const override;
+    int caretMaxOffset() const override;
     unsigned resolvedTextLength() const;
 
-    virtual int previousOffset(int current) const override final;
-    virtual int previousOffsetForBackwardDeletion(int current) const override final;
-    virtual int nextOffset(int current) const override final;
+    int previousOffset(int current) const final;
+    int previousOffsetForBackwardDeletion(int current) const final;
+    int nextOffset(int current) const final;
 
     bool containsReversedText() const { return m_containsReversedText; }
 
     bool isSecure() const { return style()->textSecurity() != TSNONE; }
     void momentarilyRevealLastTypedCharacter(unsigned lastTypedCharacterOffset);
 
     bool isAllCollapsibleWhitespace() const;
 
     bool canUseSimpleFontCodePath() const { return m_canUseSimpleFontCodePath; }
 
     void removeAndDestroyTextBoxes();
 
     PassRefPtr<AbstractInlineTextBox> firstAbstractInlineTextBox();
 
     float hyphenWidth(const Font&, TextDirection);
 
 protected:
-    virtual void willBeDestroyed() override;
+    void willBeDestroyed() override;
 
-    virtual void styleWillChange(StyleDifference, const ComputedStyle&) override final { }
-    virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
+    void styleWillChange(StyleDifference, const ComputedStyle&) final { }
+    void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
 
     virtual void setTextInternal(PassRefPtr<StringImpl>);
     virtual UChar previousCharacter() const;
 
-    virtual void addLayerHitTestRects(LayerHitTestRects&, const DeprecatedPaintLayer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const override;
+    void addLayerHitTestRects(LayerHitTestRects&, const DeprecatedPaintLayer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const override;
 
     virtual InlineTextBox* createTextBox(int start, unsigned short length); // Subclassed by SVG.
 
-    virtual void invalidateDisplayItemClients(const LayoutBoxModelObject& paintInvalidationContainer) const override;
+    void invalidateDisplayItemClients(const LayoutBoxModelObject& paintInvalidationContainer) const override;
 
 private:
     void computePreferredLogicalWidths(float leadWidth);
     void computePreferredLogicalWidths(float leadWidth, HashSet<const SimpleFontData*>& fallbackFonts, FloatRect& glyphBounds);
 
     bool computeCanUseSimpleFontCodePath() const;
 
     // Make length() private so that callers that have a LayoutText*
     // will use the more efficient textLength() instead, while
     // callers with a LayoutObject* can continue to use length().
-    virtual unsigned length() const override final { return textLength(); }
+    unsigned length() const final { return textLength(); }
 
-    virtual void paint(const PaintInfo&, const LayoutPoint&) override final { ASSERT_NOT_REACHED(); }
-    virtual void layout() override final { ASSERT_NOT_REACHED(); }
-    virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation&, const LayoutPoint&, HitTestAction) override final { ASSERT_NOT_REACHED(); return false; }
+    void paint(const PaintInfo&, const LayoutPoint&) final { ASSERT_NOT_REACHED(); }
+    void layout() final { ASSERT_NOT_REACHED(); }
+    bool nodeAtPoint(HitTestResult&, const HitTestLocation&, const LayoutPoint&, HitTestAction) final { ASSERT_NOT_REACHED(); return false; }
 
     void deleteTextBoxes();
     bool containsOnlyWhitespace(unsigned from, unsigned len) const;
     float widthFromFont(const Font&, int start, int len, float leadWidth, float textWidthSoFar, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts, FloatRect* glyphBoundsAccumulation) const;
 
     void secureText(UChar mask);
 
     bool isText() const = delete; // This will catch anyone doing an unnecessary check.
 
-    virtual LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const override;
+    LayoutRect clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* = nullptr) const override;
 
     void checkConsistency() const;
 
     // We put the bitfield first to minimize padding on 64-bit.
     bool m_hasBreakableChar : 1; // Whether or not we can be broken into multiple lines.
     bool m_hasBreak : 1; // Whether or not we have a hard break (e.g., <pre> with '\n').
     bool m_hasTab : 1; // Whether or not we have a variable width tab character (e.g., <pre> with '\t').
     bool m_hasBreakableStart : 1;
     bool m_hasBreakableEnd : 1;
     bool m_hasEndWhiteSpace : 1;
@@ skipping 48 matching lines @@
 inline LayoutText* Text::layoutObject() const
 {
     return toLayoutText(CharacterData::layoutObject());
 }
 
 void applyTextTransform(const ComputedStyle*, String&, UChar);
 
 } // namespace blink
 
 #endif // LayoutText_h