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

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

Issue 1207893002: Clean up a few includes, introduce iwyu. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Postpone stdlib cleanup. 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
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 SkFontMgr_indirect_DEFINED 8 #ifndef SkFontMgr_indirect_DEFINED
9 #define SkFontMgr_indirect_DEFINED 9 #define SkFontMgr_indirect_DEFINED
10 10
11 #include "SkDataTable.h" 11 #include "SkDataTable.h"
12 #include "SkFontMgr.h" 12 #include "SkFontMgr.h"
13 #include "SkFontStyle.h"
14 #include "SkMutex.h" 13 #include "SkMutex.h"
14 #include "SkRefCnt.h"
15 #include "SkRemotableFontMgr.h" 15 #include "SkRemotableFontMgr.h"
16 #include "SkTArray.h" 16 #include "SkTArray.h"
17 #include "SkTypeface.h" 17 #include "SkTypeface.h"
18 #include "SkTypes.h"
19
20 #include <stddef.h>
mtklein 2015/07/28 22:04:19 I think I like SkTypes providing size_t. Is that
bungeman-skia 2015/07/29 16:46:23 It isn't! Well, it was by accident by including st
18 21
19 class SkData; 22 class SkData;
20 class SkStream; 23 class SkFontStyle;
24 class SkStreamAsset;
21 class SkString; 25 class SkString;
22 class SkTypeface;
23 26
24 class SK_API SkFontMgr_Indirect : public SkFontMgr { 27 class SK_API SkFontMgr_Indirect : public SkFontMgr {
25 public: 28 public:
26 // TODO: The SkFontMgr is only used for createFromStream/File/Data. 29 // TODO: The SkFontMgr is only used for createFromStream/File/Data.
27 // In the future these calls should be broken out into their own interface 30 // In the future these calls should be broken out into their own interface
28 // with a name like SkFontRenderer. 31 // with a name like SkFontRenderer.
29 SkFontMgr_Indirect(SkFontMgr* impl, SkRemotableFontMgr* proxy) 32 SkFontMgr_Indirect(SkFontMgr* impl, SkRemotableFontMgr* proxy)
30 : fImpl(SkRef(impl)), fProxy(SkRef(proxy)), fFamilyNamesInited(false) 33 : fImpl(SkRef(impl)), fProxy(SkRef(proxy)), fFamilyNamesInited(false)
31 { } 34 { }
32 35
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 100
98 mutable SkAutoTUnref<SkDataTable> fFamilyNames; 101 mutable SkAutoTUnref<SkDataTable> fFamilyNames;
99 mutable bool fFamilyNamesInited; 102 mutable bool fFamilyNamesInited;
100 mutable SkMutex fFamilyNamesMutex; 103 mutable SkMutex fFamilyNamesMutex;
101 static void set_up_family_names(const SkFontMgr_Indirect* self); 104 static void set_up_family_names(const SkFontMgr_Indirect* self);
102 105
103 friend class SkStyleSet_Indirect; 106 friend class SkStyleSet_Indirect;
104 }; 107 };
105 108
106 #endif 109 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698