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

Unified Diff: Source/core/layout/LayoutTextCombine.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/LayoutText.cpp ('k') | Source/core/layout/LayoutTextControl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutTextCombine.h
diff --git a/Source/core/layout/LayoutTextCombine.h b/Source/core/layout/LayoutTextCombine.h
index 41d816f6e466f2c044a36188a219f1cd2fbabdc6..200bd60437f49d78149b1d548ffb0cd57e3aa17a 100644
--- a/Source/core/layout/LayoutTextCombine.h
+++ b/Source/core/layout/LayoutTextCombine.h
@@ -41,13 +41,13 @@ public:
void transformLayoutRect(LayoutRect& boxRect) const;
LayoutUnit inlineWidthForLayout() const;
- virtual const char* name() const override { return "LayoutTextCombine"; }
+ const char* name() const override { return "LayoutTextCombine"; }
private:
- virtual bool isCombineText() const override { return true; }
- virtual float width(unsigned from, unsigned length, const Font&, LayoutUnit xPosition, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = nullptr, FloatRect* glyphBounds = nullptr) const override;
- virtual void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
- virtual void setTextInternal(PassRefPtr<StringImpl>) override;
+ bool isCombineText() const override { return true; }
+ float width(unsigned from, unsigned length, const Font&, LayoutUnit xPosition, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = nullptr, FloatRect* glyphBounds = nullptr) const override;
+ void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
+ void setTextInternal(PassRefPtr<StringImpl>) override;
void updateIsCombined();
float offsetX(const LayoutRect& boxRect) const;
« no previous file with comments | « Source/core/layout/LayoutText.cpp ('k') | Source/core/layout/LayoutTextControl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698