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

Side by Side Diff: src/ports/SkFontMgr_fontconfig.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/SkFontMgr_custom.cpp ('k') | src/ports/SkFontMgr_win_dw.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 #include "SkDataTable.h" 8 #include "SkDataTable.h"
9 #include "SkFontDescriptor.h" 9 #include "SkFontDescriptor.h"
10 #include "SkFontHost_FreeType_common.h" 10 #include "SkFontHost_FreeType_common.h"
11 #include "SkFontMgr.h" 11 #include "SkFontMgr.h"
12 #include "SkFontStyle.h" 12 #include "SkFontStyle.h"
13 #include "SkMath.h" 13 #include "SkMath.h"
14 #include "SkMutex.h"
15 #include "SkString.h" 14 #include "SkString.h"
16 #include "SkStream.h" 15 #include "SkStream.h"
17 #include "SkTDArray.h" 16 #include "SkTDArray.h"
17 #include "SkThread.h"
18 #include "SkTypefaceCache.h" 18 #include "SkTypefaceCache.h"
19 #include "SkOSFile.h" 19 #include "SkOSFile.h"
20 20
21 #include <fontconfig/fontconfig.h> 21 #include <fontconfig/fontconfig.h>
22 22
23 // FC_POSTSCRIPT_NAME was added with b561ff20 which ended up in 2.10.92 23 // FC_POSTSCRIPT_NAME was added with b561ff20 which ended up in 2.10.92
24 // Ubuntu 12.04 is on 2.8.0, 13.10 is on 2.10.93 24 // Ubuntu 12.04 is on 2.8.0, 13.10 is on 2.10.93
25 // Debian 7 is on 2.9.0, 8 is on 2.11 25 // Debian 7 is on 2.9.0, 8 is on 2.11
26 // OpenSUSE 12.2 is on 2.9.0, 12.3 is on 2.10.2, 13.1 2.11.0 26 // OpenSUSE 12.2 is on 2.9.0, 12.3 is on 2.10.2, 13.1 2.11.0
27 // Fedora 19 is on 2.10.93 27 // Fedora 19 is on 2.10.93
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 return typeface.detach(); 865 return typeface.detach();
866 } 866 }
867 867
868 return this->matchFamilyStyle(NULL, style); 868 return this->matchFamilyStyle(NULL, style);
869 } 869 }
870 }; 870 };
871 871
872 SK_API SkFontMgr* SkFontMgr_New_FontConfig(FcConfig* fc) { 872 SK_API SkFontMgr* SkFontMgr_New_FontConfig(FcConfig* fc) {
873 return new SkFontMgr_fontconfig(fc); 873 return new SkFontMgr_fontconfig(fc);
874 } 874 }
OLDNEW
« no previous file with comments | « src/ports/SkFontMgr_custom.cpp ('k') | src/ports/SkFontMgr_win_dw.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698