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

Side by Side Diff: Source/platform/fonts/shaping/SimpleShaper.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) 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 *
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 if (m_forTextEmphasis) 127 if (m_forTextEmphasis)
128 glyphBuffer->add(fontData.zeroWidthSpaceGlyph(), &fo ntData, m_expansionPerOpportunity); 128 glyphBuffer->add(fontData.zeroWidthSpaceGlyph(), &fo ntData, m_expansionPerOpportunity);
129 else 129 else
130 glyphBuffer->add(fontData.spaceGlyph(), &fontData, e xpansionAtThisOpportunity); 130 glyphBuffer->add(fontData.spaceGlyph(), &fontData, e xpansionAtThisOpportunity);
131 } else { 131 } else {
132 glyphBuffer->expandLastAdvance(expansionAtThisOpportunit y); 132 glyphBuffer->expandLastAdvance(expansionAtThisOpportunit y);
133 } 133 }
134 } 134 }
135 } 135 }
136 if (m_run.allowsTrailingExpansion() 136 if (m_run.allowsTrailingExpansion()
137 || (m_run.ltr() && charData.characterOffset + charData.clusterLe ngth < static_cast<size_t>(m_run.length())) 137 || (m_run.ltr() && charData.characterOffset + charData.clusterLe ngth < m_run.length())
138 || (m_run.rtl() && charData.characterOffset)) { 138 || (m_run.rtl() && charData.characterOffset)) {
139 m_expansion -= m_expansionPerOpportunity; 139 m_expansion -= m_expansionPerOpportunity;
140 width += m_expansionPerOpportunity; 140 width += m_expansionPerOpportunity;
141 m_isAfterExpansion = true; 141 m_isAfterExpansion = true;
142 } 142 }
143 } else { 143 } else {
144 m_isAfterExpansion = false; 144 m_isAfterExpansion = false;
145 } 145 }
146 146
147 // Account for word spacing. 147 // Account for word spacing.
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 float initialWidth = m_runWidthSoFar; 254 float initialWidth = m_runWidthSoFar;
255 255
256 if (!advance(m_currentCharacter + 1)) 256 if (!advance(m_currentCharacter + 1))
257 return false; 257 return false;
258 258
259 width = m_runWidthSoFar - initialWidth; 259 width = m_runWidthSoFar - initialWidth;
260 return true; 260 return true;
261 } 261 }
262 262
263 } // namespace blink 263 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698