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

Side by Side Diff: src/core/SkAdvancedTypefaceMetrics.cpp

Issue 2219733004: SkPDF: Stop using kHAdvance_PerGlyphInfo (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2016-08-05 (Friday) 16:11:24 EDT Created 4 years, 4 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 | « no previous file | src/pdf/SkPDFDevice.cpp » ('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 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 8
9 #include "SkAdvancedTypefaceMetrics.h" 9 #include "SkAdvancedTypefaceMetrics.h"
10 #include "SkTypes.h" 10 #include "SkTypes.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 repeatedAdvances = 0; 175 repeatedAdvances = 0;
176 wildCardsInRun = trailingWildCards; 176 wildCardsInRun = trailingWildCards;
177 trailingWildCards = 0; 177 trailingWildCards = 0;
178 } 178 }
179 curRange.fAdvance.append(1, &advance); 179 curRange.fAdvance.append(1, &advance);
180 if (advance != kDontCareAdvance) { 180 if (advance != kDontCareAdvance) {
181 lastAdvance = advance; 181 lastAdvance = advance;
182 } 182 }
183 } 183 }
184 if (curRange.fStartId == lastIndex) { 184 if (curRange.fStartId == lastIndex) {
185 SkASSERT(prevRange);
186 if (!prevRange) { 185 if (!prevRange) {
187 fGlyphWidths.reset(); 186 fGlyphWidths.reset();
188 return; // https://crbug.com/567031 187 return; // https://crbug.com/567031
189 } 188 }
190 } else { 189 } else {
191 FinishRange(&curRange, lastIndex - 1, WidthRange::kRange); 190 FinishRange(&curRange, lastIndex - 1, WidthRange::kRange);
192 fGlyphWidths.emplace_back(std::move(curRange)); 191 fGlyphWidths.emplace_back(std::move(curRange));
193 } 192 }
194 } 193 }
OLDNEW
« no previous file with comments | « no previous file | src/pdf/SkPDFDevice.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698