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_android.cpp

Issue 2147733002: Remove user specified typeface id. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove one last straggler. Created 4 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/SkFontHost_win.cpp ('k') | src/ports/SkFontMgr_custom.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 "SkTypes.h" 8 #include "SkTypes.h"
9 9
10 #include "SkData.h" 10 #include "SkData.h"
(...skipping 17 matching lines...) Expand all
28 28
29 #include <limits> 29 #include <limits>
30 30
31 class SkData; 31 class SkData;
32 32
33 class SkTypeface_Android : public SkTypeface_FreeType { 33 class SkTypeface_Android : public SkTypeface_FreeType {
34 public: 34 public:
35 SkTypeface_Android(const SkFontStyle& style, 35 SkTypeface_Android(const SkFontStyle& style,
36 bool isFixedPitch, 36 bool isFixedPitch,
37 const SkString& familyName) 37 const SkString& familyName)
38 : INHERITED(style, SkTypefaceCache::NewFontID(), isFixedPitch) 38 : INHERITED(style, isFixedPitch)
39 , fFamilyName(familyName) 39 , fFamilyName(familyName)
40 { } 40 { }
41 41
42 protected: 42 protected:
43 void onGetFamilyName(SkString* familyName) const override { 43 void onGetFamilyName(SkString* familyName) const override {
44 *familyName = fFamilyName; 44 *familyName = fFamilyName;
45 } 45 }
46 46
47 SkString fFamilyName; 47 SkString fFamilyName;
48 48
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 SkASSERT(custom->fSystemFontUse < SK_ARRAY_COUNT(gSystemFontUseStrings)) ; 578 SkASSERT(custom->fSystemFontUse < SK_ARRAY_COUNT(gSystemFontUseStrings)) ;
579 SkDEBUGF(("SystemFontUse: %s BasePath: %s Fonts: %s FallbackFonts: %s\n" , 579 SkDEBUGF(("SystemFontUse: %s BasePath: %s Fonts: %s FallbackFonts: %s\n" ,
580 gSystemFontUseStrings[custom->fSystemFontUse], 580 gSystemFontUseStrings[custom->fSystemFontUse],
581 custom->fBasePath, 581 custom->fBasePath,
582 custom->fFontsXml, 582 custom->fFontsXml,
583 custom->fFallbackFontsXml)); 583 custom->fFallbackFontsXml));
584 } 584 }
585 585
586 return new SkFontMgr_Android(custom); 586 return new SkFontMgr_Android(custom);
587 } 587 }
OLDNEW
« no previous file with comments | « src/ports/SkFontHost_win.cpp ('k') | src/ports/SkFontMgr_custom.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698