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

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

Issue 1272293004: Move SkTemplates.h to private. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: It's a struct! Created 5 years, 4 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 | « include/gpu/GrResourceKey.h ('k') | include/private/SkTemplates.h » ('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 SkRemotableFontMgr_DEFINED 8 #ifndef SkRemotableFontMgr_DEFINED
9 #define SkRemotableFontMgr_DEFINED 9 #define SkRemotableFontMgr_DEFINED
10 10
11 #include "../private/SkTemplates.h"
11 #include "SkFontStyle.h" 12 #include "SkFontStyle.h"
12 #include "SkRefCnt.h" 13 #include "SkRefCnt.h"
13 #include "SkTemplates.h"
14 #include "SkTypes.h" 14 #include "SkTypes.h"
15 15
16 class SkDataTable; 16 class SkDataTable;
17 class SkStreamAsset; 17 class SkStreamAsset;
18 18
19 struct SK_API SkFontIdentity { 19 struct SK_API SkFontIdentity {
20 static const uint32_t kInvalidDataId = 0xFFFFFFFF; 20 static const uint32_t kInvalidDataId = 0xFFFFFFFF;
21 21
22 // Note that fDataId is a data identifier, not a font identifier. 22 // Note that fDataId is a data identifier, not a font identifier.
23 // (fDataID, fTtcIndex) can be seen as a font identifier. 23 // (fDataID, fTtcIndex) can be seen as a font identifier.
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 * 141 *
142 * The caller must unref() the returned object. 142 * The caller must unref() the returned object.
143 */ 143 */
144 virtual SkStreamAsset* getData(int dataId) const = 0; 144 virtual SkStreamAsset* getData(int dataId) const = 0;
145 145
146 private: 146 private:
147 typedef SkRefCnt INHERITED; 147 typedef SkRefCnt INHERITED;
148 }; 148 };
149 149
150 #endif 150 #endif
OLDNEW
« no previous file with comments | « include/gpu/GrResourceKey.h ('k') | include/private/SkTemplates.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698