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

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

Issue 1214603003: Revert of Remove SkThread.h, include SkMutex.h or SkAtomics.h as appropriate. (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: Created 5 years, 5 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/core/SkWeakRefCnt.h ('k') | src/core/SkAAClip.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 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" 13 #include "SkFontStyle.h"
14 #include "SkMutex.h"
15 #include "SkRemotableFontMgr.h" 14 #include "SkRemotableFontMgr.h"
16 #include "SkTArray.h" 15 #include "SkTArray.h"
17 #include "SkTypeface.h" 16 #include "SkTypeface.h"
18 17
19 class SkData; 18 class SkData;
20 class SkStream; 19 class SkStream;
21 class SkString; 20 class SkString;
22 class SkTypeface; 21 class SkTypeface;
23 22
24 class SK_API SkFontMgr_Indirect : public SkFontMgr { 23 class SK_API SkFontMgr_Indirect : public SkFontMgr {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 96
98 mutable SkAutoTUnref<SkDataTable> fFamilyNames; 97 mutable SkAutoTUnref<SkDataTable> fFamilyNames;
99 mutable bool fFamilyNamesInited; 98 mutable bool fFamilyNamesInited;
100 mutable SkMutex fFamilyNamesMutex; 99 mutable SkMutex fFamilyNamesMutex;
101 static void set_up_family_names(const SkFontMgr_Indirect* self); 100 static void set_up_family_names(const SkFontMgr_Indirect* self);
102 101
103 friend class SkStyleSet_Indirect; 102 friend class SkStyleSet_Indirect;
104 }; 103 };
105 104
106 #endif 105 #endif
OLDNEW
« no previous file with comments | « include/core/SkWeakRefCnt.h ('k') | src/core/SkAAClip.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698