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

Side by Side Diff: Source/core/rendering/RenderCombineText.h

Issue 129173004: Update rendering classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 11 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 unified diff | Download patch
« no previous file with comments | « Source/core/rendering/RenderButton.h ('k') | Source/core/rendering/RenderCounter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 20 matching lines...) Expand all
31 RenderCombineText(Node*, PassRefPtr<StringImpl>); 31 RenderCombineText(Node*, PassRefPtr<StringImpl>);
32 32
33 void combineText(); 33 void combineText();
34 void adjustTextOrigin(FloatPoint& textOrigin, const FloatRect& boxRect) cons t; 34 void adjustTextOrigin(FloatPoint& textOrigin, const FloatRect& boxRect) cons t;
35 void getStringToRender(int, StringView&, int& length) const; 35 void getStringToRender(int, StringView&, int& length) const;
36 bool isCombined() const { return m_isCombined; } 36 bool isCombined() const { return m_isCombined; }
37 float combinedTextWidth(const Font& font) const { return font.size(); } 37 float combinedTextWidth(const Font& font) const { return font.size(); }
38 const Font& originalFont() const { return parent()->style()->font(); } 38 const Font& originalFont() const { return parent()->style()->font(); }
39 39
40 private: 40 private:
41 virtual bool isCombineText() const { return true; } 41 virtual bool isCombineText() const OVERRIDE { return true; }
42 virtual float width(unsigned from, unsigned length, const Font&, float xPosi tion, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOve rflow* = 0) const; 42 virtual float width(unsigned from, unsigned length, const Font&, float xPosi tion, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOve rflow* = 0) const OVERRIDE;
43 virtual const char* renderName() const { return "RenderCombineText"; } 43 virtual const char* renderName() const OVERRIDE { return "RenderCombineText" ; }
44 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 44 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;
45 virtual void setTextInternal(PassRefPtr<StringImpl>); 45 virtual void setTextInternal(PassRefPtr<StringImpl>) OVERRIDE;
46 46
47 float m_combinedTextWidth; 47 float m_combinedTextWidth;
48 bool m_isCombined : 1; 48 bool m_isCombined : 1;
49 bool m_needsFontUpdate : 1; 49 bool m_needsFontUpdate : 1;
50 }; 50 };
51 51
52 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderCombineText, isCombineText()); 52 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderCombineText, isCombineText());
53 53
54 } // namespace WebCore 54 } // namespace WebCore
55 55
56 #endif // RenderCombineText_h 56 #endif // RenderCombineText_h
OLDNEW
« 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