| OLD | NEW |
| 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 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 | 270 |
| 271 // Overlay the parent page on the fallback page. Check if the fa
llback font | 271 // Overlay the parent page on the fallback page. Check if the fa
llback font |
| 272 // has added anything. | 272 // has added anything. |
| 273 bool newGlyphs = false; | 273 bool newGlyphs = false; |
| 274 for (unsigned i = 0; i < GlyphPage::size; i++) { | 274 for (unsigned i = 0; i < GlyphPage::size; i++) { |
| 275 if (parentPage->glyphAt(i)) | 275 if (parentPage->glyphAt(i)) |
| 276 m_page->setGlyphDataForIndex(i, parentPage->glyphDataFor
Index(i)); | 276 m_page->setGlyphDataForIndex(i, parentPage->glyphDataFor
Index(i)); |
| 277 else if (fallbackPage->glyphAt(i)) { | 277 else if (fallbackPage->glyphAt(i)) { |
| 278 m_page->setGlyphDataForIndex(i, fallbackPage->glyphDataF
orIndex(i)); | 278 m_page->setGlyphDataForIndex(i, fallbackPage->glyphDataF
orIndex(i)); |
| 279 newGlyphs = true; | 279 newGlyphs = true; |
| 280 } else | 280 } |
| 281 m_page->setGlyphDataForIndex(i, 0, 0); | |
| 282 } | 281 } |
| 283 | 282 |
| 284 if (!newGlyphs) | 283 if (!newGlyphs) |
| 285 // We didn't override anything, so our override is just the
parent page. | 284 // We didn't override anything, so our override is just the
parent page. |
| 286 m_page = parentPage; | 285 m_page = parentPage; |
| 287 } | 286 } |
| 288 } | 287 } |
| 289 } else { | 288 } else { |
| 290 // System fallback. Initialized with the parent's page here, as individu
al | 289 // System fallback. Initialized with the parent's page here, as individu
al |
| 291 // entries may use different fonts depending on character. If the Font | 290 // entries may use different fonts depending on character. If the Font |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 406 printf("\nPage %d:\n", it->key); | 405 printf("\nPage %d:\n", it->key); |
| 407 showGlyphPageTree(it->key); | 406 showGlyphPageTree(it->key); |
| 408 } | 407 } |
| 409 } | 408 } |
| 410 | 409 |
| 411 void showGlyphPageTree(unsigned pageNumber) | 410 void showGlyphPageTree(unsigned pageNumber) |
| 412 { | 411 { |
| 413 WebCore::GlyphPageTreeNode::getRoot(pageNumber)->showSubtree(); | 412 WebCore::GlyphPageTreeNode::getRoot(pageNumber)->showSubtree(); |
| 414 } | 413 } |
| 415 #endif | 414 #endif |
| OLD | NEW |