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

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

Issue 1207893002: Clean up a few includes, introduce iwyu. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: SkTypes to export stddef. 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 | « src/ports/SkFontMgr_custom.cpp ('k') | src/ports/SkFontMgr_fontconfig_factory.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 "SkFixed.h"
9 #include "SkFontDescriptor.h" 10 #include "SkFontDescriptor.h"
10 #include "SkFontHost_FreeType_common.h" 11 #include "SkFontHost_FreeType_common.h"
11 #include "SkFontMgr.h" 12 #include "SkFontMgr.h"
12 #include "SkFontStyle.h" 13 #include "SkFontStyle.h"
13 #include "SkMath.h" 14 #include "SkMath.h"
14 #include "SkMutex.h" 15 #include "SkMutex.h"
16 #include "SkOSFile.h"
17 #include "SkRefCnt.h"
18 #include "SkStream.h"
15 #include "SkString.h" 19 #include "SkString.h"
16 #include "SkStream.h"
17 #include "SkTDArray.h" 20 #include "SkTDArray.h"
21 #include "SkTemplates.h"
22 #include "SkTypeface.h"
18 #include "SkTypefaceCache.h" 23 #include "SkTypefaceCache.h"
19 #include "SkOSFile.h" 24 #include "SkTypes.h"
20 25
21 #include <fontconfig/fontconfig.h> 26 #include <fontconfig/fontconfig.h>
27 #include <string.h>
28
29 class SkData;
22 30
23 // FC_POSTSCRIPT_NAME was added with b561ff20 which ended up in 2.10.92 31 // 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 32 // 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 33 // 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 34 // 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 35 // Fedora 19 is on 2.10.93
28 #ifndef FC_POSTSCRIPT_NAME 36 #ifndef FC_POSTSCRIPT_NAME
29 # define FC_POSTSCRIPT_NAME "postscriptname" 37 # define FC_POSTSCRIPT_NAME "postscriptname"
30 #endif 38 #endif
31 39
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
865 return typeface.detach(); 873 return typeface.detach();
866 } 874 }
867 875
868 return this->matchFamilyStyle(NULL, style); 876 return this->matchFamilyStyle(NULL, style);
869 } 877 }
870 }; 878 };
871 879
872 SK_API SkFontMgr* SkFontMgr_New_FontConfig(FcConfig* fc) { 880 SK_API SkFontMgr* SkFontMgr_New_FontConfig(FcConfig* fc) {
873 return new SkFontMgr_fontconfig(fc); 881 return new SkFontMgr_fontconfig(fc);
874 } 882 }
OLDNEW
« no previous file with comments | « src/ports/SkFontMgr_custom.cpp ('k') | src/ports/SkFontMgr_fontconfig_factory.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698