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

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

Issue 652483002: TextRun::length() should return an unsigned (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase 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
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
22 #include "core/rendering/svg/SVGTextMetricsBuilder.h" 21 #include "core/rendering/svg/SVGTextMetricsBuilder.h"
23 22
24 #include "core/rendering/svg/RenderSVGInline.h" 23 #include "core/rendering/svg/RenderSVGInline.h"
25 #include "core/rendering/svg/RenderSVGInlineText.h" 24 #include "core/rendering/svg/RenderSVGInlineText.h"
26 #include "core/rendering/svg/RenderSVGText.h" 25 #include "core/rendering/svg/RenderSVGText.h"
27 #include "core/rendering/svg/SVGTextMetrics.h" 26 #include "core/rendering/svg/SVGTextMetrics.h"
28 #include "platform/fonts/GlyphBuffer.h" 27 #include "platform/fonts/GlyphBuffer.h"
29 #include "platform/fonts/shaping/SimpleShaper.h" 28 #include "platform/fonts/shaping/SimpleShaper.h"
30 #include "platform/text/BidiCharacterRun.h" 29 #include "platform/text/BidiCharacterRun.h"
31 #include "platform/text/BidiResolver.h" 30 #include "platform/text/BidiResolver.h"
32 #include "platform/text/TextDirection.h" 31 #include "platform/text/TextDirection.h"
33 #include "platform/text/TextPath.h" 32 #include "platform/text/TextPath.h"
34 #include "platform/text/TextRun.h" 33 #include "platform/text/TextRun.h"
35 #include "platform/text/TextRunIterator.h" 34 #include "platform/text/TextRunIterator.h"
36 #include "wtf/Vector.h" 35 #include "wtf/Vector.h"
37 36
38 namespace blink { 37 namespace blink {
39 38
40 class SVGTextMetricsCalculator { 39 class SVGTextMetricsCalculator {
41 public: 40 public:
42 SVGTextMetricsCalculator(RenderSVGInlineText*); 41 SVGTextMetricsCalculator(RenderSVGInlineText*);
43 ~SVGTextMetricsCalculator(); 42 ~SVGTextMetricsCalculator();
44 43
45 SVGTextMetrics computeMetricsForCharacter(unsigned textPosition); 44 SVGTextMetrics computeMetricsForCharacter(unsigned textPosition);
46 unsigned textLength() const { return static_cast<unsigned>(m_run.charactersL ength()); } 45 unsigned textLength() const { return m_run.charactersLength(); }
47 46
48 bool characterStartsSurrogatePair(unsigned textPosition) const 47 bool characterStartsSurrogatePair(unsigned textPosition) const
49 { 48 {
50 return U16_IS_LEAD(m_run[textPosition]) && textPosition + 1 < textLength () && U16_IS_TRAIL(m_run[textPosition + 1]); 49 return U16_IS_LEAD(m_run[textPosition]) && textPosition + 1 < textLength () && U16_IS_TRAIL(m_run[textPosition + 1]);
51 } 50 }
52 bool characterIsWhiteSpace(unsigned textPosition) const 51 bool characterIsWhiteSpace(unsigned textPosition) const
53 { 52 {
54 return m_run[textPosition] == ' '; 53 return m_run[textPosition] == ' ';
55 } 54 }
56 55
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 } 269 }
271 270
272 void SVGTextMetricsBuilder::buildMetricsAndLayoutAttributes(RenderSVGText* textR oot, RenderSVGInlineText* stopAtLeaf, SVGCharacterDataMap& allCharactersMap) 271 void SVGTextMetricsBuilder::buildMetricsAndLayoutAttributes(RenderSVGText* textR oot, RenderSVGInlineText* stopAtLeaf, SVGCharacterDataMap& allCharactersMap)
273 { 272 {
274 ASSERT(textRoot); 273 ASSERT(textRoot);
275 MeasureTextData data(&allCharactersMap); 274 MeasureTextData data(&allCharactersMap);
276 walkTree(textRoot, stopAtLeaf, &data); 275 walkTree(textRoot, stopAtLeaf, &data);
277 } 276 }
278 277
279 } 278 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698