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

Issue 2030683002: Update typeface serialization style. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase Created 4 years, 6 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.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 "SkFontDescriptor.h"
9 #include "SkFontHost_FreeType_common.h" 9 #include "SkFontHost_FreeType_common.h"
10 #include "SkFontMgr.h" 10 #include "SkFontMgr.h"
(...skipping 25 matching lines...) Expand all
36 36
37 bool isSysFont() const { return fIsSysFont; } 37 bool isSysFont() const { return fIsSysFont; }
38 38
39 protected: 39 protected:
40 void onGetFamilyName(SkString* familyName) const override { 40 void onGetFamilyName(SkString* familyName) const override {
41 *familyName = fFamilyName; 41 *familyName = fFamilyName;
42 } 42 }
43 43
44 void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const overri de { 44 void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const overri de {
45 desc->setFamilyName(fFamilyName.c_str()); 45 desc->setFamilyName(fFamilyName.c_str());
46 desc->setStyle(this->fontStyle());
46 *isLocal = !this->isSysFont(); 47 *isLocal = !this->isSysFont();
47 } 48 }
48 49
49 int getIndex() const { return fIndex; } 50 int getIndex() const { return fIndex; }
50 51
51 private: 52 private:
52 const bool fIsSysFont; 53 const bool fIsSysFont;
53 const SkString fFamilyName; 54 const SkString fFamilyName;
54 const int fIndex; 55 const int fIndex;
55 56
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
510 SkFontStyleSet_Custom* family = new SkFontStyleSet_Custom(SkString()); 511 SkFontStyleSet_Custom* family = new SkFontStyleSet_Custom(SkString());
511 families->push_back().reset(family); 512 families->push_back().reset(family);
512 family->appendTypeface(sk_make_sp<SkTypeface_Empty>()); 513 family->appendTypeface(sk_make_sp<SkTypeface_Empty>());
513 } 514 }
514 515
515 }; 516 };
516 517
517 SK_API SkFontMgr* SkFontMgr_New_Custom_Empty() { 518 SK_API SkFontMgr* SkFontMgr_New_Custom_Empty() {
518 return new SkFontMgr_Custom(EmptyFontLoader()); 519 return new SkFontMgr_Custom(EmptyFontLoader());
519 } 520 }
OLDNEW
« no previous file with comments | « src/ports/SkFontMgr_android.cpp ('k') | src/ports/SkFontMgr_fontconfig.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698