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

Side by Side Diff: third_party/WebKit/Source/platform/fonts/shaping/SimpleShaper.cpp

Issue 1847853004: Move Character.h from platform/fonts to platform/text (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again Created 4 years, 8 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) 2003, 2006, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2003, 2006, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * Copyright (C) 2008 Holger Hans Peter Freyther 3 * Copyright (C) 2008 Holger Hans Peter Freyther
4 * Copyright (C) 2014 Google Inc. All rights reserved. 4 * Copyright (C) 2014 Google Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
11 * This library is distributed in the hope that it will be useful, 11 * This library is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 * Library General Public License for more details. 14 * Library General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU Library General Public License 16 * You should have received a copy of the GNU Library General Public License
17 * along with this library; see the file COPYING.LIB. If not, write to 17 * along with this library; see the file COPYING.LIB. If not, write to
18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 18 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
19 * Boston, MA 02110-1301, USA. 19 * Boston, MA 02110-1301, USA.
20 * 20 *
21 */ 21 */
22 22
23 #include "platform/fonts/shaping/SimpleShaper.h" 23 #include "platform/fonts/shaping/SimpleShaper.h"
24 24
25 #include "platform/fonts/Character.h"
26 #include "platform/fonts/Font.h" 25 #include "platform/fonts/Font.h"
27 #include "platform/fonts/GlyphBuffer.h" 26 #include "platform/fonts/GlyphBuffer.h"
28 #include "platform/fonts/Latin1TextIterator.h" 27 #include "platform/fonts/Latin1TextIterator.h"
29 #include "platform/fonts/SimpleFontData.h" 28 #include "platform/fonts/SimpleFontData.h"
30 #include "platform/fonts/UTF16TextIterator.h" 29 #include "platform/fonts/UTF16TextIterator.h"
30 #include "platform/text/Character.h"
31 #include "wtf/MathExtras.h" 31 #include "wtf/MathExtras.h"
32 #include "wtf/text/CharacterNames.h" 32 #include "wtf/text/CharacterNames.h"
33 33
34 using namespace WTF; 34 using namespace WTF;
35 using namespace Unicode; 35 using namespace Unicode;
36 36
37 namespace blink { 37 namespace blink {
38 38
39 SimpleShaper::SimpleShaper(const Font* font, const TextRun& run, const GlyphData * emphasisData, 39 SimpleShaper::SimpleShaper(const Font* font, const TextRun& run, const GlyphData * emphasisData,
40 HashSet<const SimpleFontData*>* fallbackFonts, FloatRect* bounds) 40 HashSet<const SimpleFontData*>* fallbackFonts, FloatRect* bounds)
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 float initialWidth = m_runWidthSoFar; 218 float initialWidth = m_runWidthSoFar;
219 219
220 if (!advance(m_currentCharacter + 1)) 220 if (!advance(m_currentCharacter + 1))
221 return false; 221 return false;
222 222
223 width = m_runWidthSoFar - initialWidth; 223 width = m_runWidthSoFar - initialWidth;
224 return true; 224 return true;
225 } 225 }
226 226
227 } // namespace blink 227 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698