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

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

Issue 656913006: Remove SVG fonts (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Update tests for landing 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 | Annotate | Revision Log
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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 for (HashMap<int, GlyphPageTreeNode*>::iterator it = roots->begin(); it != end; ++it) 113 for (HashMap<int, GlyphPageTreeNode*>::iterator it = roots->begin(); it != end; ++it)
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 #if ENABLE(SVG_FONTS)
124 if (fontData->isSVGFont())
125 return fontData->customFontData()->fillSVGGlyphPage(pageToFill, offset, length, buffer, bufferLength, fontData);
126 #endif
127 bool hasGlyphs = fontData->fillGlyphPage(pageToFill, offset, length, buffer, bufferLength); 123 bool hasGlyphs = fontData->fillGlyphPage(pageToFill, offset, length, buffer, bufferLength);
128 #if ENABLE(OPENTYPE_VERTICAL) 124 #if ENABLE(OPENTYPE_VERTICAL)
129 if (hasGlyphs && fontData->verticalData()) 125 if (hasGlyphs && fontData->verticalData())
130 fontData->verticalData()->substituteWithVerticalGlyphs(fontData, pageToF ill, offset, length); 126 fontData->verticalData()->substituteWithVerticalGlyphs(fontData, pageToF ill, offset, length);
131 #endif 127 #endif
132 return hasGlyphs; 128 return hasGlyphs;
133 } 129 }
134 130
135 void GlyphPageTreeNode::initializePage(const FontData* fontData, unsigned pageNu mber) 131 void GlyphPageTreeNode::initializePage(const FontData* fontData, unsigned pageNu mber)
136 { 132 {
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 if (level > fontData->maxGlyphPageTreeLevel()) 386 if (level > fontData->maxGlyphPageTreeLevel())
391 return; 387 return;
392 388
393 GlyphPageTreeNodeMap::iterator end = m_children.end(); 389 GlyphPageTreeNodeMap::iterator end = m_children.end();
394 for (GlyphPageTreeNodeMap::iterator it = m_children.begin(); it != end; ++it ) 390 for (GlyphPageTreeNodeMap::iterator it = m_children.begin(); it != end; ++it )
395 it->value->pruneFontData(fontData, level); 391 it->value->pruneFontData(fontData, level);
396 } 392 }
397 393
398 } // namespace blink 394 } // namespace blink
399 395
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698