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

Unified Diff: Source/core/rendering/RenderCombineText.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 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/rendering/RenderButton.h ('k') | Source/core/rendering/RenderCounter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderCombineText.h
diff --git a/Source/core/rendering/RenderCombineText.h b/Source/core/rendering/RenderCombineText.h
index 95ccd9d3e566f12d9a26563f02cb8f43d3e675d4..c1fc771a767cfc4b3ad552ef8369b86b775a56e5 100644
--- a/Source/core/rendering/RenderCombineText.h
+++ b/Source/core/rendering/RenderCombineText.h
@@ -26,7 +26,7 @@
namespace blink {
-class RenderCombineText FINAL : public RenderText {
+class RenderCombineText final : public RenderText {
public:
RenderCombineText(Node*, PassRefPtr<StringImpl>);
@@ -38,11 +38,11 @@ public:
const Font& originalFont() const { return parent()->style()->font(); }
private:
- virtual bool isCombineText() const OVERRIDE { return true; }
- virtual float width(unsigned from, unsigned length, const Font&, float xPosition, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const OVERRIDE;
- virtual const char* renderName() const OVERRIDE { return "RenderCombineText"; }
- virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
- virtual void setTextInternal(PassRefPtr<StringImpl>) OVERRIDE;
+ virtual bool isCombineText() const override { return true; }
+ virtual float width(unsigned from, unsigned length, const Font&, float xPosition, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const override;
+ virtual const char* renderName() const override { return "RenderCombineText"; }
+ virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
+ virtual void setTextInternal(PassRefPtr<StringImpl>) override;
float m_combinedTextWidth;
String m_renderingText;
« no previous file with comments | « Source/core/rendering/RenderButton.h ('k') | Source/core/rendering/RenderCounter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698