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

Side by Side Diff: Source/platform/fonts/GlyphPageTreeNode.cpp

Issue 617103003: Replace ENABLE_OPENTYPE_VERTICAL implementation with HarfBuzz (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@removeOpenTypeVertical
Patch Set: Additional TestExpectations tweaking for Mac Created 6 years 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 | « Source/platform/fonts/FontPlatformData.cpp ('k') | Source/platform/fonts/SimpleFontData.h » ('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 (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 it->value->pruneFontData(fontData); 114 it->value->pruneFontData(fontData);
115 } 115 }
116 116
117 if (pageZeroRoot) 117 if (pageZeroRoot)
118 pageZeroRoot->pruneFontData(fontData); 118 pageZeroRoot->pruneFontData(fontData);
119 } 119 }
120 120
121 static bool fill(GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData) 121 static bool fill(GlyphPage* pageToFill, unsigned offset, unsigned length, UChar* buffer, unsigned bufferLength, const SimpleFontData* fontData)
122 { 122 {
123 bool hasGlyphs = fontData->fillGlyphPage(pageToFill, offset, length, buffer, bufferLength); 123 bool hasGlyphs = fontData->fillGlyphPage(pageToFill, offset, length, buffer, bufferLength);
124 #if ENABLE(OPENTYPE_VERTICAL)
125 if (hasGlyphs && fontData->verticalData())
126 fontData->verticalData()->substituteWithVerticalGlyphs(fontData, pageToF ill, offset, length);
127 #endif
128 return hasGlyphs; 124 return hasGlyphs;
129 } 125 }
130 126
131 void GlyphPageTreeNode::initializePage(const FontData* fontData, unsigned pageNu mber) 127 void GlyphPageTreeNode::initializePage(const FontData* fontData, unsigned pageNu mber)
132 { 128 {
133 ASSERT(!m_page); 129 ASSERT(!m_page);
134 130
135 // This function must not be called for the root of the tree, because that 131 // This function must not be called for the root of the tree, because that
136 // level does not contain any glyphs. 132 // level does not contain any glyphs.
137 ASSERT(m_level > 0 && m_parent); 133 ASSERT(m_level > 0 && m_parent);
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 if (level > fontData->maxGlyphPageTreeLevel()) 381 if (level > fontData->maxGlyphPageTreeLevel())
386 return; 382 return;
387 383
388 GlyphPageTreeNodeMap::iterator end = m_children.end(); 384 GlyphPageTreeNodeMap::iterator end = m_children.end();
389 for (GlyphPageTreeNodeMap::iterator it = m_children.begin(); it != end; ++it ) 385 for (GlyphPageTreeNodeMap::iterator it = m_children.begin(); it != end; ++it )
390 it->value->pruneFontData(fontData, level); 386 it->value->pruneFontData(fontData, level);
391 } 387 }
392 388
393 } // namespace blink 389 } // namespace blink
394 390
OLDNEW
« no previous file with comments | « Source/platform/fonts/FontPlatformData.cpp ('k') | Source/platform/fonts/SimpleFontData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698