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

Side by Side Diff: include/ports/SkFontMgr.h

Issue 66783003: Remove SK_FONTHOST_USES_FONTMGR. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 1 month 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 | « include/core/SkTypeface.h ('k') | src/core/SkFontHost.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 #ifndef SkFontMgr_DEFINED 8 #ifndef SkFontMgr_DEFINED
9 #define SkFontMgr_DEFINED 9 #define SkFontMgr_DEFINED
10 10
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 virtual SkTypeface* onCreateFromData(SkData*, int ttcIndex) = 0; 99 virtual SkTypeface* onCreateFromData(SkData*, int ttcIndex) = 0;
100 virtual SkTypeface* onCreateFromStream(SkStream*, int ttcIndex) = 0; 100 virtual SkTypeface* onCreateFromStream(SkStream*, int ttcIndex) = 0;
101 virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) = 0; 101 virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) = 0;
102 102
103 // TODO: make this pure-virtual once all ports know about it 103 // TODO: make this pure-virtual once all ports know about it
104 virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], 104 virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
105 unsigned styleBits) = 0; 105 unsigned styleBits) = 0;
106 private: 106 private:
107 static SkFontMgr* Factory(); // implemented by porting layer 107 static SkFontMgr* Factory(); // implemented by porting layer
108 friend void set_up_default(SkFontMgr** singleton);
108 109
109 typedef SkRefCnt INHERITED; 110 typedef SkRefCnt INHERITED;
110 }; 111 };
111 112
112 #endif 113 #endif
OLDNEW
« no previous file with comments | « include/core/SkTypeface.h ('k') | src/core/SkFontHost.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698