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

Side by Side Diff: src/core/SkFontDescriptor.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/core/SkFont.cpp ('k') | src/core/SkFontMgr.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 2012 Google Inc. 2 * Copyright 2012 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 SkFontDescriptor_DEFINED 8 #ifndef SkFontDescriptor_DEFINED
9 #define SkFontDescriptor_DEFINED 9 #define SkFontDescriptor_DEFINED
10 10
(...skipping 14 matching lines...) Expand all
25 SkFontData(const SkFontData& that) 25 SkFontData(const SkFontData& that)
26 : fStream(that.fStream->duplicate()) 26 : fStream(that.fStream->duplicate())
27 , fIndex(that.fIndex) 27 , fIndex(that.fIndex)
28 , fAxisCount(that.fAxisCount) 28 , fAxisCount(that.fAxisCount)
29 , fAxis(fAxisCount) 29 , fAxis(fAxisCount)
30 { 30 {
31 for (int i = 0; i < fAxisCount; ++i) { 31 for (int i = 0; i < fAxisCount; ++i) {
32 fAxis[i] = that.fAxis[i]; 32 fAxis[i] = that.fAxis[i];
33 } 33 }
34 } 34 }
35 bool hasStream() const { return fStream.get() != NULL; } 35 bool hasStream() const { return fStream.get() != nullptr; }
36 SkStreamAsset* duplicateStream() const { return fStream->duplicate(); } 36 SkStreamAsset* duplicateStream() const { return fStream->duplicate(); }
37 SkStreamAsset* detachStream() { return fStream.detach(); } 37 SkStreamAsset* detachStream() { return fStream.detach(); }
38 SkStreamAsset* getStream() { return fStream.get(); } 38 SkStreamAsset* getStream() { return fStream.get(); }
39 int getIndex() const { return fIndex; } 39 int getIndex() const { return fIndex; }
40 int getAxisCount() const { return fAxisCount; } 40 int getAxisCount() const { return fAxisCount; }
41 const SkFixed* getAxis() const { return fAxis.get(); } 41 const SkFixed* getAxis() const { return fAxis.get(); }
42 42
43 private: 43 private:
44 SkAutoTDelete<SkStreamAsset> fStream; 44 SkAutoTDelete<SkStreamAsset> fStream;
45 int fIndex; 45 int fIndex;
46 int fAxisCount; 46 int fAxisCount;
47 SkAutoSTMalloc<4, SkFixed> fAxis; 47 SkAutoSTMalloc<4, SkFixed> fAxis;
48 }; 48 };
49 49
50 class SkFontDescriptor : SkNoncopyable { 50 class SkFontDescriptor : SkNoncopyable {
51 public: 51 public:
52 SkFontDescriptor(SkTypeface::Style = SkTypeface::kNormal); 52 SkFontDescriptor(SkTypeface::Style = SkTypeface::kNormal);
53 // Does not affect ownership of SkStream. 53 // Does not affect ownership of SkStream.
54 SkFontDescriptor(SkStream*); 54 SkFontDescriptor(SkStream*);
55 55
56 void serialize(SkWStream*); 56 void serialize(SkWStream*);
57 57
58 SkTypeface::Style getStyle() { return fStyle; } 58 SkTypeface::Style getStyle() { return fStyle; }
59 void setStyle(SkTypeface::Style style) { fStyle = style; } 59 void setStyle(SkTypeface::Style style) { fStyle = style; }
60 60
61 const char* getFamilyName() const { return fFamilyName.c_str(); } 61 const char* getFamilyName() const { return fFamilyName.c_str(); }
62 const char* getFullName() const { return fFullName.c_str(); } 62 const char* getFullName() const { return fFullName.c_str(); }
63 const char* getPostscriptName() const { return fPostscriptName.c_str(); } 63 const char* getPostscriptName() const { return fPostscriptName.c_str(); }
64 bool hasFontData() const { return fFontData.get() != NULL; } 64 bool hasFontData() const { return fFontData.get() != nullptr; }
65 SkFontData* detachFontData() { return fFontData.detach(); } 65 SkFontData* detachFontData() { return fFontData.detach(); }
66 66
67 void setFamilyName(const char* name) { fFamilyName.set(name); } 67 void setFamilyName(const char* name) { fFamilyName.set(name); }
68 void setFullName(const char* name) { fFullName.set(name); } 68 void setFullName(const char* name) { fFullName.set(name); }
69 void setPostscriptName(const char* name) { fPostscriptName.set(name); } 69 void setPostscriptName(const char* name) { fPostscriptName.set(name); }
70 /** Set the font data only if it is necessary for serialization. 70 /** Set the font data only if it is necessary for serialization.
71 * This method takes ownership of the font data. */ 71 * This method takes ownership of the font data. */
72 void setFontData(SkFontData* data) { fFontData.reset(data); } 72 void setFontData(SkFontData* data) { fFontData.reset(data); }
73 73
74 private: 74 private:
75 SkString fFamilyName; 75 SkString fFamilyName;
76 SkString fFullName; 76 SkString fFullName;
77 SkString fPostscriptName; 77 SkString fPostscriptName;
78 SkAutoTDelete<SkFontData> fFontData; 78 SkAutoTDelete<SkFontData> fFontData;
79 79
80 SkTypeface::Style fStyle; 80 SkTypeface::Style fStyle;
81 }; 81 };
82 82
83 #endif // SkFontDescriptor_DEFINED 83 #endif // SkFontDescriptor_DEFINED
OLDNEW
« no previous file with comments | « src/core/SkFont.cpp ('k') | src/core/SkFontMgr.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698