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

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

Issue 1139123008: Revert of Font variations. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 7 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_FreeType_common.h ('k') | src/ports/SkFontHost_linux.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 2008 Google Inc. 2 * Copyright 2008 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 "SkFontConfigTypeface.h" 9 #include "SkFontConfigTypeface.h"
10 #include "SkFontDescriptor.h" 10 #include "SkFontDescriptor.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 148
149 void FontConfigTypeface::onGetFamilyName(SkString* familyName) const { 149 void FontConfigTypeface::onGetFamilyName(SkString* familyName) const {
150 *familyName = fFamilyName; 150 *familyName = fFamilyName;
151 } 151 }
152 152
153 void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc, 153 void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
154 bool* isLocalStream) const { 154 bool* isLocalStream) const {
155 SkString name; 155 SkString name;
156 this->getFamilyName(&name); 156 this->getFamilyName(&name);
157 desc->setFamilyName(name.c_str()); 157 desc->setFamilyName(name.c_str());
158 desc->setFontIndex(this->getIdentity().fTTCIndex);
158 *isLocalStream = SkToBool(this->getLocalStream()); 159 *isLocalStream = SkToBool(this->getLocalStream());
159 } 160 }
OLDNEW
« no previous file with comments | « src/ports/SkFontHost_FreeType_common.h ('k') | src/ports/SkFontHost_linux.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698