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

Side by Side Diff: src/fonts/SkTestScalerContext.h

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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 | « src/fonts/SkFontMgr_indirect.cpp ('k') | src/fonts/SkTestScalerContext.cpp » ('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 2014 Google Inc. 2 * Copyright 2014 Google Inc.
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 #ifndef SkTestScalerContext_DEFINED 8 #ifndef SkTestScalerContext_DEFINED
9 #define SkTestScalerContext_DEFINED 9 #define SkTestScalerContext_DEFINED
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 void getPath(const SkGlyph& glyph, SkPath* path); 67 void getPath(const SkGlyph& glyph, SkPath* path);
68 protected: 68 protected:
69 SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const overr ide; 69 SkScalerContext* onCreateScalerContext(const SkDescriptor* desc) const overr ide;
70 void onFilterRec(SkScalerContextRec* rec) const override; 70 void onFilterRec(SkScalerContextRec* rec) const override;
71 SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( 71 SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
72 PerGlyphInfo, 72 PerGlyphInfo,
73 const uint32_t* glyphIDs, 73 const uint32_t* glyphIDs,
74 uint32_t glyphIDsCount) const override; 74 uint32_t glyphIDsCount) const override;
75 75
76 SkStreamAsset* onOpenStream(int* ttcIndex) const override { 76 SkStreamAsset* onOpenStream(int* ttcIndex) const override {
77 return NULL; 77 return nullptr;
78 } 78 }
79 79
80 void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const overri de; 80 void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const overri de;
81 81
82 int onCharsToGlyphs(const void* chars, Encoding encoding, 82 int onCharsToGlyphs(const void* chars, Encoding encoding,
83 uint16_t glyphs[], int glyphCount) const override; 83 uint16_t glyphs[], int glyphCount) const override;
84 84
85 int onCountGlyphs() const override { 85 int onCountGlyphs() const override {
86 return (int) fTestFont->fCharCodesCount; 86 return (int) fTestFont->fCharCodesCount;
87 } 87 }
(...skipping 15 matching lines...) Expand all
103 return 0; 103 return 0;
104 } 104 }
105 private: 105 private:
106 SkTestFont* fTestFont; 106 SkTestFont* fTestFont;
107 friend class SkTestScalerContext; 107 friend class SkTestScalerContext;
108 }; 108 };
109 109
110 SkTypeface* CreateTestTypeface(const char* name, SkTypeface::Style style); 110 SkTypeface* CreateTestTypeface(const char* name, SkTypeface::Style style);
111 111
112 #endif 112 #endif
OLDNEW
« no previous file with comments | « src/fonts/SkFontMgr_indirect.cpp ('k') | src/fonts/SkTestScalerContext.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698