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

Side by Side Diff: Source/core/rendering/svg/SVGTextMetrics.h

Issue 665253003: Remove SVGTextMetrics::m_glyph (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Drop WTFString.h include. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) Research In Motion Limited 2010-2012. All rights reserved. 2 * Copyright (C) Research In Motion Limited 2010-2012. 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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Library General Public License for more details. 12 * Library General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Library General Public License 14 * You should have received a copy of the GNU Library General Public License
15 * along with this library; see the file COPYING.LIB. If not, write to 15 * along with this library; see the file COPYING.LIB. If not, write to
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17 * Boston, MA 02110-1301, USA. 17 * Boston, MA 02110-1301, USA.
18 */ 18 */
19 19
20 #ifndef SVGTextMetrics_h 20 #ifndef SVGTextMetrics_h
21 #define SVGTextMetrics_h 21 #define SVGTextMetrics_h
22 22
23 #include "platform/fonts/Glyph.h"
24 #include "platform/text/TextDirection.h" 23 #include "platform/text/TextDirection.h"
25 #include "wtf/text/WTFString.h"
26 24
27 namespace blink { 25 namespace blink {
28 26
29 class RenderSVGInlineText; 27 class RenderSVGInlineText;
30 class TextRun; 28 class TextRun;
31 29
32 class SVGTextMetrics { 30 class SVGTextMetrics {
33 public: 31 public:
34 enum MetricsType { 32 enum MetricsType {
35 SkippedSpaceMetrics 33 SkippedSpaceMetrics
36 }; 34 };
37 35
38 SVGTextMetrics(); 36 SVGTextMetrics();
39 SVGTextMetrics(MetricsType); 37 SVGTextMetrics(MetricsType);
40 SVGTextMetrics(RenderSVGInlineText*, unsigned position, unsigned length, flo at width, Glyph glyphNameGlyphId); 38 SVGTextMetrics(RenderSVGInlineText*, unsigned position, unsigned length, flo at width);
41 39
42 // FIXME: Migrate away from these to the two below. 40 // FIXME: Migrate away from these to the two below.
43 static SVGTextMetrics measureCharacterRange(RenderSVGInlineText*, unsigned p osition, unsigned length); 41 static SVGTextMetrics measureCharacterRange(RenderSVGInlineText*, unsigned p osition, unsigned length);
44 static TextRun constructTextRun(RenderSVGInlineText*, unsigned position, uns igned length); 42 static TextRun constructTextRun(RenderSVGInlineText*, unsigned position, uns igned length);
45 43
46 static SVGTextMetrics measureCharacterRange(RenderSVGInlineText*, unsigned p osition, unsigned length, TextDirection); 44 static SVGTextMetrics measureCharacterRange(RenderSVGInlineText*, unsigned p osition, unsigned length, TextDirection);
47 static TextRun constructTextRun(RenderSVGInlineText*, unsigned position, uns igned length, TextDirection); 45 static TextRun constructTextRun(RenderSVGInlineText*, unsigned position, uns igned length, TextDirection);
48 46
49 bool isEmpty() const { return !m_width && !m_height && m_length <= 1; } 47 bool isEmpty() const { return !m_width && !m_height && m_length <= 1; }
50 48
51 float width() const { return m_width; } 49 float width() const { return m_width; }
52 void setWidth(float width) { m_width = width; } 50 void setWidth(float width) { m_width = width; }
53 51
54 float height() const { return m_height; } 52 float height() const { return m_height; }
55 unsigned length() const { return m_length; } 53 unsigned length() const { return m_length; }
56 54
57 // Only useful when measuring individual characters, to lookup ligatures.
58 Glyph glyph() const { return m_glyph; }
59
60 private: 55 private:
61 SVGTextMetrics(RenderSVGInlineText*, const TextRun&); 56 SVGTextMetrics(RenderSVGInlineText*, const TextRun&);
62 57
63 float m_width; 58 float m_width;
64 float m_height; 59 float m_height;
65 unsigned m_length; 60 unsigned m_length;
66 Glyph m_glyph;
67 }; 61 };
68 62
69 } // namespace blink 63 } // namespace blink
70 64
71 #endif 65 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/svg/SVGTextLayoutEngineSpacing.h ('k') | Source/core/rendering/svg/SVGTextMetrics.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698