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

Side by Side Diff: src/ports/SkFontHost_win.cpp

Issue 1225053003: Remove another assertion that a reference is non-null. (Closed) Base URL: https://chromium.googlesource.com/skia.git@master
Patch Set: Created 5 years, 5 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
« no previous file with comments | « no previous file | no next file » | 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 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkAdvancedTypefaceMetrics.h" 8 #include "SkAdvancedTypefaceMetrics.h"
9 #include "SkBase64.h" 9 #include "SkBase64.h"
10 #include "SkColorPriv.h" 10 #include "SkColorPriv.h"
(...skipping 1606 matching lines...) Expand 10 before | Expand all | Expand 10 after
1617 if (GDI_ERROR == ret) { 1617 if (GDI_ERROR == ret) {
1618 SkASSERT(false); 1618 SkASSERT(false);
1619 return 0; 1619 return 0;
1620 } 1620 }
1621 } 1621 }
1622 } 1622 }
1623 return total_size; 1623 return total_size;
1624 } 1624 }
1625 1625
1626 void SkScalerContext_GDI::generatePath(const SkGlyph& glyph, SkPath* path) { 1626 void SkScalerContext_GDI::generatePath(const SkGlyph& glyph, SkPath* path) {
1627 SkASSERT(&glyph && path); 1627 SkASSERT(path);
1628 SkASSERT(fDDC); 1628 SkASSERT(fDDC);
1629 1629
1630 path->reset(); 1630 path->reset();
1631 1631
1632 // Out of all the fonts on a typical Windows box, 1632 // Out of all the fonts on a typical Windows box,
1633 // 25% of glyphs require more than 2KB. 1633 // 25% of glyphs require more than 2KB.
1634 // 1% of glyphs require more than 4KB. 1634 // 1% of glyphs require more than 4KB.
1635 // 0.01% of glyphs require more than 8KB. 1635 // 0.01% of glyphs require more than 8KB.
1636 // 8KB is less than 1% of the normal 1MB stack on Windows. 1636 // 8KB is less than 1% of the normal 1MB stack on Windows.
1637 // Note that some web fonts glyphs require more than 20KB. 1637 // Note that some web fonts glyphs require more than 20KB.
(...skipping 884 matching lines...) Expand 10 before | Expand all | Expand 10 after
2522 2522
2523 private: 2523 private:
2524 SkTDArray<ENUMLOGFONTEX> fLogFontArray; 2524 SkTDArray<ENUMLOGFONTEX> fLogFontArray;
2525 }; 2525 };
2526 2526
2527 /////////////////////////////////////////////////////////////////////////////// 2527 ///////////////////////////////////////////////////////////////////////////////
2528 2528
2529 SkFontMgr* SkFontMgr_New_GDI() { 2529 SkFontMgr* SkFontMgr_New_GDI() {
2530 return SkNEW(SkFontMgrGDI); 2530 return SkNEW(SkFontMgrGDI);
2531 } 2531 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698