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

Side by Side Diff: src/ports/SkFontConfigTypeface.h

Issue 66783003: Remove SK_FONTHOST_USES_FONTMGR. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « src/fonts/SkGScalerContext.cpp ('k') | src/ports/SkFontHost_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 2013 Google Inc. 2 * Copyright 2013 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 "SkFontConfigInterface.h" 8 #include "SkFontConfigInterface.h"
9 #include "SkFontHost_FreeType_common.h" 9 #include "SkFontHost_FreeType_common.h"
10 #include "SkStream.h" 10 #include "SkStream.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 50
51 static SkTypeface* LegacyCreateTypeface(const SkTypeface* family, 51 static SkTypeface* LegacyCreateTypeface(const SkTypeface* family,
52 const char familyName[], 52 const char familyName[],
53 SkTypeface::Style); 53 SkTypeface::Style);
54 54
55 protected: 55 protected:
56 friend class SkFontHost; // hack until we can make public versions 56 friend class SkFontHost; // hack until we can make public versions
57 57
58 virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE ; 58 virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE ;
59 virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; 59 virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
60 virtual SkTypeface* onRefMatchingStyle(Style) const SK_OVERRIDE;
61 60
62 private: 61 private:
63 typedef SkTypeface_FreeType INHERITED; 62 typedef SkTypeface_FreeType INHERITED;
64 }; 63 };
OLDNEW
« no previous file with comments | « src/fonts/SkGScalerContext.cpp ('k') | src/ports/SkFontHost_fontconfig.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698