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

Side by Side Diff: Source/core/rendering/svg/SVGTextMetricsBuilder.cpp

Issue 116423007: Moving Text Simple/Complex Path prefix from Font.cpp to new File (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixing merge issues 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/RenderText.cpp ('k') | Source/platform/blink_platform.gypi » ('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) 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 #include "config.h" 20 #include "config.h"
21 21
22 #include "core/rendering/svg/SVGTextMetricsBuilder.h" 22 #include "core/rendering/svg/SVGTextMetricsBuilder.h"
23 23
24 #include "core/rendering/svg/RenderSVGInlineText.h" 24 #include "core/rendering/svg/RenderSVGInlineText.h"
25 #include "core/rendering/svg/RenderSVGText.h" 25 #include "core/rendering/svg/RenderSVGText.h"
26 #include "platform/text/TextPath.h"
26 27
27 namespace WebCore { 28 namespace WebCore {
28 29
29 SVGTextMetricsBuilder::SVGTextMetricsBuilder() 30 SVGTextMetricsBuilder::SVGTextMetricsBuilder()
30 : m_text(0) 31 : m_text(0)
31 , m_run(static_cast<const UChar*>(0), 0) 32 , m_run(static_cast<const UChar*>(0), 0)
32 , m_textPosition(0) 33 , m_textPosition(0)
33 , m_isComplexText(false) 34 , m_isComplexText(false)
34 , m_totalWidth(0) 35 , m_totalWidth(0)
35 { 36 {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 void SVGTextMetricsBuilder::initializeMeasurementWithTextRenderer(RenderSVGInlin eText* text) 95 void SVGTextMetricsBuilder::initializeMeasurementWithTextRenderer(RenderSVGInlin eText* text)
95 { 96 {
96 m_text = text; 97 m_text = text;
97 m_textPosition = 0; 98 m_textPosition = 0;
98 m_currentMetrics = SVGTextMetrics(); 99 m_currentMetrics = SVGTextMetrics();
99 m_complexStartToCurrentMetrics = SVGTextMetrics(); 100 m_complexStartToCurrentMetrics = SVGTextMetrics();
100 m_totalWidth = 0; 101 m_totalWidth = 0;
101 102
102 const Font& scaledFont = text->scaledFont(); 103 const Font& scaledFont = text->scaledFont();
103 m_run = SVGTextMetrics::constructTextRun(text, 0, text->textLength()); 104 m_run = SVGTextMetrics::constructTextRun(text, 0, text->textLength());
104 m_isComplexText = scaledFont.codePath(m_run) == Font::Complex; 105 m_isComplexText = scaledFont.codePath(m_run) == ComplexPath;
105 106
106 if (m_isComplexText) 107 if (m_isComplexText)
107 m_simpleWidthIterator.clear(); 108 m_simpleWidthIterator.clear();
108 else 109 else
109 m_simpleWidthIterator = adoptPtr(new WidthIterator(&scaledFont, m_run)); 110 m_simpleWidthIterator = adoptPtr(new WidthIterator(&scaledFont, m_run));
110 } 111 }
111 112
112 struct MeasureTextData { 113 struct MeasureTextData {
113 MeasureTextData(SVGCharacterDataMap* characterDataMap) 114 MeasureTextData(SVGCharacterDataMap* characterDataMap)
114 : allCharactersMap(characterDataMap) 115 : allCharactersMap(characterDataMap)
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 } 218 }
218 219
219 void SVGTextMetricsBuilder::buildMetricsAndLayoutAttributes(RenderSVGText* textR oot, RenderSVGInlineText* stopAtLeaf, SVGCharacterDataMap& allCharactersMap) 220 void SVGTextMetricsBuilder::buildMetricsAndLayoutAttributes(RenderSVGText* textR oot, RenderSVGInlineText* stopAtLeaf, SVGCharacterDataMap& allCharactersMap)
220 { 221 {
221 ASSERT(textRoot); 222 ASSERT(textRoot);
222 MeasureTextData data(&allCharactersMap); 223 MeasureTextData data(&allCharactersMap);
223 walkTree(textRoot, stopAtLeaf, &data); 224 walkTree(textRoot, stopAtLeaf, &data);
224 } 225 }
225 226
226 } 227 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderText.cpp ('k') | Source/platform/blink_platform.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698