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

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

Issue 943333004: Remove SkFontHost includes and friends. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix comments. Created 5 years, 10 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_fontconfig.cpp ('k') | src/ports/SkFontHost_mac.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 "SkFontHost.h"
9 #include "SkFontHost_FreeType_common.h" 8 #include "SkFontHost_FreeType_common.h"
10 #include "SkFontDescriptor.h" 9 #include "SkFontDescriptor.h"
11 #include "SkFontMgr.h" 10 #include "SkFontMgr.h"
12 #include "SkDescriptor.h" 11 #include "SkDescriptor.h"
13 #include "SkOSFile.h" 12 #include "SkOSFile.h"
14 #include "SkPaint.h" 13 #include "SkPaint.h"
15 #include "SkRTConf.h" 14 #include "SkRTConf.h"
16 #include "SkString.h" 15 #include "SkString.h"
17 #include "SkStream.h" 16 #include "SkStream.h"
18 #include "SkThread.h" 17 #include "SkThread.h"
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 429
431 SkTArray<SkAutoTUnref<SkFontStyleSet_Custom>, true> fFamilies; 430 SkTArray<SkAutoTUnref<SkFontStyleSet_Custom>, true> fFamilies;
432 SkFontStyleSet_Custom* gDefaultFamily; 431 SkFontStyleSet_Custom* gDefaultFamily;
433 SkTypeface* gDefaultNormal; 432 SkTypeface* gDefaultNormal;
434 SkTypeface_FreeType::Scanner fScanner; 433 SkTypeface_FreeType::Scanner fScanner;
435 }; 434 };
436 435
437 SkFontMgr* SkFontMgr::Factory() { 436 SkFontMgr* SkFontMgr::Factory() {
438 return new SkFontMgr_Custom(SK_FONT_FILE_PREFIX); 437 return new SkFontMgr_Custom(SK_FONT_FILE_PREFIX);
439 } 438 }
OLDNEW
« no previous file with comments | « src/ports/SkFontHost_fontconfig.cpp ('k') | src/ports/SkFontHost_mac.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698