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

Side by Side Diff: src/ports/SkFontMgr_custom.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_android_parser.cpp ('k') | src/ports/SkFontMgr_fontconfig.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 "SkFontDescriptor.h"
8 #include "SkFontHost_FreeType_common.h" 9 #include "SkFontHost_FreeType_common.h"
9 #include "SkFontDescriptor.h"
10 #include "SkFontMgr.h" 10 #include "SkFontMgr.h"
11 #include "SkFontMgr_custom.h" 11 #include "SkFontMgr_custom.h"
12 #include "SkDescriptor.h" 12 #include "SkFontStyle.h"
13 #include "SkOSFile.h" 13 #include "SkOSFile.h"
14 #include "SkPaint.h" 14 #include "SkRefCnt.h"
15 #include "SkRTConf.h" 15 #include "SkStream.h"
16 #include "SkString.h" 16 #include "SkString.h"
17 #include "SkStream.h" 17 #include "SkTArray.h"
18 #include "SkTSearch.h" 18 #include "SkTemplates.h"
19 #include "SkTypeface.h"
19 #include "SkTypefaceCache.h" 20 #include "SkTypefaceCache.h"
20 #include "SkTArray.h" 21 #include "SkTypes.h"
21 22
22 #include <limits> 23 #include <limits>
23 24
25 class SkData;
26
24 /** The base SkTypeface implementation for the custom font manager. */ 27 /** The base SkTypeface implementation for the custom font manager. */
25 class SkTypeface_Custom : public SkTypeface_FreeType { 28 class SkTypeface_Custom : public SkTypeface_FreeType {
26 public: 29 public:
27 SkTypeface_Custom(const SkFontStyle& style, bool isFixedPitch, 30 SkTypeface_Custom(const SkFontStyle& style, bool isFixedPitch,
28 bool sysFont, const SkString familyName, int index) 31 bool sysFont, const SkString familyName, int index)
29 : INHERITED(style, SkTypefaceCache::NewFontID(), isFixedPitch) 32 : INHERITED(style, SkTypefaceCache::NewFontID(), isFixedPitch)
30 , fIsSysFont(sysFont), fFamilyName(familyName), fIndex(index) 33 , fIsSysFont(sysFont), fFamilyName(familyName), fIndex(index)
31 { } 34 { }
32 35
33 bool isSysFont() const { return fIsSysFont; } 36 bool isSysFont() const { return fIsSysFont; }
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 addTo->appendTypeface(tf); 507 addTo->appendTypeface(tf);
505 } 508 }
506 } 509 }
507 510
508 const SkEmbeddedResourceHeader* fHeader; 511 const SkEmbeddedResourceHeader* fHeader;
509 }; 512 };
510 513
511 SkFontMgr* SkFontMgr_New_Custom_Embedded(const SkEmbeddedResourceHeader* header) { 514 SkFontMgr* SkFontMgr_New_Custom_Embedded(const SkEmbeddedResourceHeader* header) {
512 return new SkFontMgr_Custom(EmbeddedSystemFontLoader(header)); 515 return new SkFontMgr_Custom(EmbeddedSystemFontLoader(header));
513 } 516 }
OLDNEW
« no previous file with comments | « src/ports/SkFontMgr_android_parser.cpp ('k') | src/ports/SkFontMgr_fontconfig.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698