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

Unified Diff: Source/core/layout/LayoutTextFragment.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/LayoutTextControlSingleLine.h ('k') | Source/core/layout/LayoutTextTrackContainer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutTextFragment.h
diff --git a/Source/core/layout/LayoutTextFragment.h b/Source/core/layout/LayoutTextFragment.h
index fd9be61e4886ed2e8b3bf576640691f0be57d68a..ede137a0992ac460b57c585a5e48835c1c905fd0 100644
--- a/Source/core/layout/LayoutTextFragment.h
+++ b/Source/core/layout/LayoutTextFragment.h
@@ -37,16 +37,16 @@ class LayoutTextFragment final : public LayoutText {
public:
LayoutTextFragment(Node*, StringImpl*, int startOffset, int length);
LayoutTextFragment(Node*, StringImpl*);
- virtual ~LayoutTextFragment();
+ ~LayoutTextFragment() override;
- virtual bool isTextFragment() const override { return true; }
+ bool isTextFragment() const override { return true; }
- virtual bool canBeSelectionLeaf() const override { return node() && node()->hasEditableStyle(); }
+ bool canBeSelectionLeaf() const override { return node() && node()->hasEditableStyle(); }
unsigned start() const { return m_start; }
unsigned end() const { return m_end; }
- virtual unsigned textStartOffset() const override { return start(); }
+ unsigned textStartOffset() const override { return start(); }
void setContentString(StringImpl*);
StringImpl* contentString() const { return m_contentString.get(); }
@@ -56,15 +56,15 @@ public:
// things like first-letter this may differ from the completeText as we maybe using
// only a portion of the text nodes content.
- virtual PassRefPtr<StringImpl> originalText() const override;
+ PassRefPtr<StringImpl> originalText() const override;
- virtual void setText(PassRefPtr<StringImpl>, bool force = false) override;
+ void setText(PassRefPtr<StringImpl>, bool force = false) override;
void setTextFragment(PassRefPtr<StringImpl>, unsigned start, unsigned length);
- virtual void transformText() override;
+ void transformText() override;
// FIXME: Rename to LayoutTextFragment
- virtual const char* name() const override { return "LayoutTextFragment"; }
+ const char* name() const override { return "LayoutTextFragment"; }
void setFirstLetterPseudoElement(FirstLetterPseudoElement* element) { m_firstLetterPseudoElement = element; }
FirstLetterPseudoElement* firstLetterPseudoElement() const { return m_firstLetterPseudoElement; }
@@ -73,11 +73,11 @@ public:
bool isRemainingTextLayoutObject() const { return m_isRemainingTextLayoutObject; }
protected:
- virtual void willBeDestroyed() override;
+ void willBeDestroyed() override;
private:
LayoutBlock* blockForAccompanyingFirstLetter() const;
- virtual UChar previousCharacter() const override;
+ UChar previousCharacter() const override;
Text* associatedTextNode() const;
void updateHitTestResult(HitTestResult&, const LayoutPoint&) override;
« no previous file with comments | « Source/core/layout/LayoutTextControlSingleLine.h ('k') | Source/core/layout/LayoutTextTrackContainer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698