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

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

Issue 728873002: Enforce pure virtual behavior for onMatchFamilyStyleCharacter (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: add missing impl Created 6 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
« no previous file with comments | « src/ports/SkFontHost_linux.cpp ('k') | src/ports/SkFontHost_win.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 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #ifdef SK_BUILD_FOR_MAC 9 #ifdef SK_BUILD_FOR_MAC
10 #import <ApplicationServices/ApplicationServices.h> 10 #import <ApplicationServices/ApplicationServices.h>
(...skipping 2135 matching lines...) Expand 10 before | Expand all | Expand 10 after
2146 virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVER RIDE { 2146 virtual SkFontStyleSet* onMatchFamily(const char familyName[]) const SK_OVER RIDE {
2147 AutoCFRelease<CFStringRef> cfName(make_CFString(familyName)); 2147 AutoCFRelease<CFStringRef> cfName(make_CFString(familyName));
2148 return CreateSet(cfName); 2148 return CreateSet(cfName);
2149 } 2149 }
2150 2150
2151 virtual SkTypeface* onMatchFamilyStyle(const char familyName[], 2151 virtual SkTypeface* onMatchFamilyStyle(const char familyName[],
2152 const SkFontStyle&) const SK_OVERRIDE { 2152 const SkFontStyle&) const SK_OVERRIDE {
2153 return NULL; 2153 return NULL;
2154 } 2154 }
2155 2155
2156 virtual SkTypeface* onMatchFamilyStyleCharacter(const char familyName[], con st SkFontStyle&,
2157 const char* bcp47[], int bcp 47Count,
2158 SkUnichar character) const S K_OVERRIDE {
2159 return NULL;
2160 }
2161
2156 virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember, 2162 virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,
2157 const SkFontStyle&) const SK_OVERRIDE { 2163 const SkFontStyle&) const SK_OVERRIDE {
2158 return NULL; 2164 return NULL;
2159 } 2165 }
2160 2166
2161 virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OV ERRIDE { 2167 virtual SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OV ERRIDE {
2162 AutoCFRelease<CGDataProviderRef> pr(SkCreateDataProviderFromData(data)); 2168 AutoCFRelease<CGDataProviderRef> pr(SkCreateDataProviderFromData(data));
2163 if (NULL == pr) { 2169 if (NULL == pr) {
2164 return NULL; 2170 return NULL;
2165 } 2171 }
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
2208 } 2214 }
2209 return face; 2215 return face;
2210 } 2216 }
2211 }; 2217 };
2212 2218
2213 /////////////////////////////////////////////////////////////////////////////// 2219 ///////////////////////////////////////////////////////////////////////////////
2214 2220
2215 SkFontMgr* SkFontMgr::Factory() { 2221 SkFontMgr* SkFontMgr::Factory() {
2216 return SkNEW(SkFontMgr_Mac); 2222 return SkNEW(SkFontMgr_Mac);
2217 } 2223 }
OLDNEW
« no previous file with comments | « src/ports/SkFontHost_linux.cpp ('k') | src/ports/SkFontHost_win.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698