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

Side by Side Diff: src/ports/SkFontConfigTypeface.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/ports/SkFontConfigInterface_direct.cpp ('k') | src/ports/SkFontHost_FreeType.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 2013 Google Inc. 2 * Copyright 2013 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 #include "SkFontConfigInterface.h" 8 #include "SkFontConfigInterface.h"
9 #include "SkFontHost_FreeType_common.h" 9 #include "SkFontHost_FreeType_common.h"
10 #include "SkStream.h" 10 #include "SkStream.h"
(...skipping 30 matching lines...) Expand all
41 41
42 static SkTypeface* LegacyCreateTypeface(const char familyName[], SkTypeface: :Style); 42 static SkTypeface* LegacyCreateTypeface(const char familyName[], SkTypeface: :Style);
43 43
44 protected: 44 protected:
45 FontConfigTypeface(const SkFontStyle& style, 45 FontConfigTypeface(const SkFontStyle& style,
46 const SkFontConfigInterface::FontIdentity& fi, 46 const SkFontConfigInterface::FontIdentity& fi,
47 const SkString& familyName) 47 const SkString& familyName)
48 : INHERITED(style, SkTypefaceCache::NewFontID(), false) 48 : INHERITED(style, SkTypefaceCache::NewFontID(), false)
49 , fIdentity(fi) 49 , fIdentity(fi)
50 , fFamilyName(familyName) 50 , fFamilyName(familyName)
51 , fLocalStream(NULL) {} 51 , fLocalStream(nullptr) {}
52 52
53 FontConfigTypeface(const SkFontStyle& style, bool fixedWidth, SkStreamAsset* localStream) 53 FontConfigTypeface(const SkFontStyle& style, bool fixedWidth, SkStreamAsset* localStream)
54 : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth) 54 : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth)
55 , fLocalStream(localStream) { 55 , fLocalStream(localStream) {
56 // we default to empty fFamilyName and fIdentity 56 // we default to empty fFamilyName and fIdentity
57 } 57 }
58 58
59 void onGetFamilyName(SkString* familyName) const override; 59 void onGetFamilyName(SkString* familyName) const override;
60 void onGetFontDescriptor(SkFontDescriptor*, bool*) const override; 60 void onGetFontDescriptor(SkFontDescriptor*, bool*) const override;
61 SkStreamAsset* onOpenStream(int* ttcIndex) const override; 61 SkStreamAsset* onOpenStream(int* ttcIndex) const override;
62 62
63 private: 63 private:
64 typedef SkTypeface_FreeType INHERITED; 64 typedef SkTypeface_FreeType INHERITED;
65 }; 65 };
OLDNEW
« no previous file with comments | « src/ports/SkFontConfigInterface_direct.cpp ('k') | src/ports/SkFontHost_FreeType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698