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

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

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Final rebase Created 6 years, 10 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
« no previous file with comments | « Source/platform/fonts/FontFallbackList.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 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 for (int j = from; j < to; j++) { 252 for (int j = from; j < to; j++) {
253 if (!m_page->glyphAt(j) && pageToFill->glyphAt(j )) 253 if (!m_page->glyphAt(j) && pageToFill->glyphAt(j ))
254 m_page->setGlyphDataForIndex(j, pageToFill-> glyphDataForIndex(j)); 254 m_page->setGlyphDataForIndex(j, pageToFill-> glyphDataForIndex(j));
255 } 255 }
256 } 256 }
257 } 257 }
258 } 258 }
259 } 259 }
260 260
261 if (!haveGlyphs) 261 if (!haveGlyphs)
262 m_page = 0; 262 m_page = nullptr;
263 } else if (parentPage && parentPage->owner() != m_parent) { 263 } else if (parentPage && parentPage->owner() != m_parent) {
264 // The page we're overriding may not be owned by our parent node. 264 // The page we're overriding may not be owned by our parent node.
265 // This happens when our parent node provides no useful overrides 265 // This happens when our parent node provides no useful overrides
266 // and just copies the pointer to an already-existing page (see 266 // and just copies the pointer to an already-existing page (see
267 // below). 267 // below).
268 // 268 //
269 // We want our override to be shared by all nodes that reference 269 // We want our override to be shared by all nodes that reference
270 // that page to avoid duplication, and so standardize on having the 270 // that page to avoid duplication, and so standardize on having the
271 // page's owner collect all the overrides. Call getChild on the 271 // page's owner collect all the overrides. Call getChild on the
272 // page owner with the desired font data (this will populate 272 // page owner with the desired font data (this will populate
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 printf("\nPage %d:\n", it->key); 428 printf("\nPage %d:\n", it->key);
429 showGlyphPageTree(it->key); 429 showGlyphPageTree(it->key);
430 } 430 }
431 } 431 }
432 432
433 void showGlyphPageTree(unsigned pageNumber) 433 void showGlyphPageTree(unsigned pageNumber)
434 { 434 {
435 WebCore::GlyphPageTreeNode::getRoot(pageNumber)->showSubtree(); 435 WebCore::GlyphPageTreeNode::getRoot(pageNumber)->showSubtree();
436 } 436 }
437 #endif 437 #endif
OLDNEW
« no previous file with comments | « Source/platform/fonts/FontFallbackList.cpp ('k') | Source/platform/fonts/SimpleFontData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698