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

Unified Diff: Source/platform/fonts/opentype/OpenTypeVerticalData.cpp

Issue 235863018: Simplify GlyphPage initialization for SegmentedFontData (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/fonts/GlyphPageTreeNode.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/opentype/OpenTypeVerticalData.cpp
diff --git a/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp b/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp
index 7c8ab6ec5ced4596edcdb9cc800cd19e4e1ee229..c1df3abc0b6a6999fe56b1e7fce197465e9bff54 100644
--- a/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp
+++ b/Source/platform/fonts/opentype/OpenTypeVerticalData.cpp
@@ -560,10 +560,9 @@ void OpenTypeVerticalData::substituteWithVerticalGlyphs(const SimpleFontData* fo
return;
for (unsigned index = offset, end = offset + length; index < end; ++index) {
- Glyph glyph = glyphPage->glyphAt(index);
- if (glyph) {
- ASSERT(glyphPage->glyphDataForIndex(index).fontData == font);
- Glyph to = map.get(glyph);
+ GlyphData glyphData = glyphPage->glyphDataForIndex(index);
+ if (glyphData.glyph && glyphData.fontData == font) {
+ Glyph to = map.get(glyphData.glyph);
if (to)
glyphPage->setGlyphDataForIndex(index, to, font);
}
« no previous file with comments | « Source/platform/fonts/GlyphPageTreeNode.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698