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

Side by Side Diff: src/ports/SkFontHost_win.cpp

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 | « src/ports/SkFontHost_mac.cpp ('k') | src/ports/SkFontMgr_custom.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 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
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 #include "SkAdvancedTypefaceMetrics.h" 8 #include "SkAdvancedTypefaceMetrics.h"
9 #include "SkBase64.h" 9 #include "SkBase64.h"
10 #include "SkColorPriv.h" 10 #include "SkColorPriv.h"
11 #include "SkData.h" 11 #include "SkData.h"
12 #include "SkDescriptor.h" 12 #include "SkDescriptor.h"
13 #include "SkFontDescriptor.h" 13 #include "SkFontDescriptor.h"
14 #include "SkGlyph.h" 14 #include "SkGlyph.h"
15 #include "SkHRESULT.h" 15 #include "SkHRESULT.h"
16 #include "SkMaskGamma.h" 16 #include "SkMaskGamma.h"
17 #include "SkMatrix22.h" 17 #include "SkMatrix22.h"
18 #include "SkOTTable_maxp.h" 18 #include "SkOTTable_maxp.h"
19 #include "SkOTTable_name.h" 19 #include "SkOTTable_name.h"
20 #include "SkOTUtils.h" 20 #include "SkOTUtils.h"
21 #include "SkPath.h" 21 #include "SkPath.h"
22 #include "SkSFNTHeader.h" 22 #include "SkSFNTHeader.h"
23 #include "SkStream.h" 23 #include "SkStream.h"
24 #include "SkString.h" 24 #include "SkString.h"
25 #include "SkTemplates.h" 25 #include "SkTemplates.h"
26 #include "SkThread.h"
26 #include "SkTypeface_win.h" 27 #include "SkTypeface_win.h"
27 #include "SkTypefaceCache.h" 28 #include "SkTypefaceCache.h"
28 #include "SkUtils.h" 29 #include "SkUtils.h"
29 30
30 #include "SkTypes.h" 31 #include "SkTypes.h"
31 #include <tchar.h> 32 #include <tchar.h>
32 #include <usp10.h> 33 #include <usp10.h>
33 #include <objbase.h> 34 #include <objbase.h>
34 35
35 static void (*gEnsureLOGFONTAccessibleProc)(const LOGFONT&); 36 static void (*gEnsureLOGFONTAccessibleProc)(const LOGFONT&);
(...skipping 2485 matching lines...) Expand 10 before | Expand all | Expand 10 after
2521 2522
2522 private: 2523 private:
2523 SkTDArray<ENUMLOGFONTEX> fLogFontArray; 2524 SkTDArray<ENUMLOGFONTEX> fLogFontArray;
2524 }; 2525 };
2525 2526
2526 /////////////////////////////////////////////////////////////////////////////// 2527 ///////////////////////////////////////////////////////////////////////////////
2527 2528
2528 SkFontMgr* SkFontMgr_New_GDI() { 2529 SkFontMgr* SkFontMgr_New_GDI() {
2529 return SkNEW(SkFontMgrGDI); 2530 return SkNEW(SkFontMgrGDI);
2530 } 2531 }
OLDNEW
« no previous file with comments | « src/ports/SkFontHost_mac.cpp ('k') | src/ports/SkFontMgr_custom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698