Index: Source/core/layout/line/InlineTextBox.h |
diff --git a/Source/core/layout/line/InlineTextBox.h b/Source/core/layout/line/InlineTextBox.h |
index 280d373e2b3487473b5812868a7c8adade5d4732..5ddce3b641f0901ceaac7ddbff127ad5a79f32fa 100644 |
--- a/Source/core/layout/line/InlineTextBox.h |
+++ b/Source/core/layout/line/InlineTextBox.h |
@@ -51,7 +51,7 @@ public: |
LayoutText& layoutObject() const { return toLayoutText(InlineBox::layoutObject()); } |
- virtual void destroy() override final; |
+ void destroy() final; |
InlineTextBox* prevTextBox() const { return m_prevTextBox; } |
InlineTextBox* nextTextBox() const { return m_nextTextBox; } |
@@ -67,7 +67,7 @@ public: |
unsigned short truncation() { return m_truncation; } |
- virtual void markDirty() override final; |
+ void markDirty() final; |
using InlineBox::hasHyphen; |
using InlineBox::setHasHyphen; |
@@ -76,8 +76,8 @@ public: |
static inline bool compareByStart(const InlineTextBox* first, const InlineTextBox* second) { return first->start() < second->start(); } |
- virtual int baselinePosition(FontBaseline) const override final; |
- virtual LayoutUnit lineHeight() const override final; |
+ int baselinePosition(FontBaseline) const final; |
+ LayoutUnit lineHeight() const final; |
bool getEmphasisMarkPosition(const ComputedStyle&, TextEmphasisPosition&) const; |
@@ -91,16 +91,16 @@ public: |
TextRun constructTextRun(const ComputedStyle&, const Font&, StringView, int maximumLength, StringBuilder* charactersWithHyphen = nullptr) const; |
#ifndef NDEBUG |
- virtual void showBox(int = 0) const override; |
+ void showBox(int = 0) const override; |
#endif |
- virtual const char* boxName() const override; |
- virtual String debugName() const override; |
+ const char* boxName() const override; |
+ String debugName() const override; |
String text() const; |
public: |
TextRun constructTextRunForInspector(const ComputedStyle&, const Font&) const; |
- virtual LayoutRect calculateBoundaries() const override { return LayoutRect(x(), y(), width(), height()); } |
+ LayoutRect calculateBoundaries() const override { return LayoutRect(x(), y(), width(), height()); } |
virtual LayoutRect localSelectionRect(int startPos, int endPos); |
bool isSelected(int startPos, int endPos) const; |
@@ -110,26 +110,26 @@ public: |
virtual void paintDocumentMarker(GraphicsContext*, const LayoutPoint& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&, bool grammar); |
virtual void paintTextMatchMarker(GraphicsContext*, const LayoutPoint& boxOrigin, DocumentMarker*, const ComputedStyle&, const Font&); |
- virtual void move(const LayoutSize&) override final; |
+ void move(const LayoutSize&) final; |
protected: |
- virtual void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override; |
- virtual bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override; |
+ void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override; |
+ bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override; |
private: |
- virtual void deleteLine() override final; |
- virtual void extractLine() override final; |
- virtual void attachLine() override final; |
+ void deleteLine() final; |
+ void extractLine() final; |
+ void attachLine() final; |
public: |
- virtual LayoutObject::SelectionState selectionState() const override final; |
+ LayoutObject::SelectionState selectionState() const final; |
private: |
- virtual void clearTruncation() override final { m_truncation = cNoTruncation; } |
- virtual LayoutUnit placeEllipsisBox(bool flowIsLTR, LayoutUnit visibleLeftEdge, LayoutUnit visibleRightEdge, LayoutUnit ellipsisWidth, LayoutUnit &truncatedWidth, bool& foundBox) override final; |
+ void clearTruncation() final { m_truncation = cNoTruncation; } |
+ LayoutUnit placeEllipsisBox(bool flowIsLTR, LayoutUnit visibleLeftEdge, LayoutUnit visibleRightEdge, LayoutUnit ellipsisWidth, LayoutUnit &truncatedWidth, bool& foundBox) final; |
public: |
- virtual bool isLineBreak() const override final; |
+ bool isLineBreak() const final; |
void setExpansion(int newExpansion) |
{ |
@@ -139,11 +139,11 @@ public: |
} |
private: |
- virtual bool isInlineTextBox() const override final { return true; } |
+ bool isInlineTextBox() const final { return true; } |
public: |
- virtual int caretMinOffset() const override final; |
- virtual int caretMaxOffset() const override final; |
+ int caretMinOffset() const final; |
+ int caretMaxOffset() const final; |
LayoutUnit textPos() const; // returns the x position relative to the left start of the text line. |