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

Side by Side Diff: include/core/SkTypeface.h

Issue 2345353002: Remove SK_DECLARE_LEGACY_CREATE_FROM_FONTDATA. (Closed)
Patch Set: Created 4 years, 3 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 | « no previous file | include/ports/SkFontMgr.h » ('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 #ifndef SkTypeface_DEFINED 8 #ifndef SkTypeface_DEFINED
9 #define SkTypeface_DEFINED 9 #define SkTypeface_DEFINED
10 10
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 const SkDescriptor*) const = 0; 353 const SkDescriptor*) const = 0;
354 virtual void onFilterRec(SkScalerContextRec*) const = 0; 354 virtual void onFilterRec(SkScalerContextRec*) const = 0;
355 virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( 355 virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
356 PerGlyphInfo, 356 PerGlyphInfo,
357 const uint32_t* glyphIDs, 357 const uint32_t* glyphIDs,
358 uint32_t glyphIDsCount) const = 0; 358 uint32_t glyphIDsCount) const = 0;
359 359
360 virtual SkStreamAsset* onOpenStream(int* ttcIndex) const = 0; 360 virtual SkStreamAsset* onOpenStream(int* ttcIndex) const = 0;
361 // TODO: make pure virtual. 361 // TODO: make pure virtual.
362 virtual std::unique_ptr<SkFontData> onMakeFontData() const; 362 virtual std::unique_ptr<SkFontData> onMakeFontData() const;
363 #ifdef SK_DECLARE_LEGACY_CREATE_FROM_FONTDATA
364 virtual SkFontData* onCreateFontData() const { return nullptr; };
365 #endif
366 363
367 virtual void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const = 0 ; 364 virtual void onGetFontDescriptor(SkFontDescriptor*, bool* isLocal) const = 0 ;
368 365
369 virtual int onCharsToGlyphs(const void* chars, Encoding, SkGlyphID glyphs[], 366 virtual int onCharsToGlyphs(const void* chars, Encoding, SkGlyphID glyphs[],
370 int glyphCount) const = 0; 367 int glyphCount) const = 0;
371 virtual int onCountGlyphs() const = 0; 368 virtual int onCountGlyphs() const = 0;
372 369
373 virtual int onGetUPEM() const = 0; 370 virtual int onGetUPEM() const = 0;
374 virtual bool onGetKerningPairAdjustments(const SkGlyphID glyphs[], int count , 371 virtual bool onGetKerningPairAdjustments(const SkGlyphID glyphs[], int count ,
375 int32_t adjustments[]) const; 372 int32_t adjustments[]) const;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
421 friend class SkGlyphCache; // GetDefaultTypeface 418 friend class SkGlyphCache; // GetDefaultTypeface
422 419
423 typedef SkWeakRefCnt INHERITED; 420 typedef SkWeakRefCnt INHERITED;
424 }; 421 };
425 422
426 namespace skstd { 423 namespace skstd {
427 template <> struct is_bitmask_enum<SkTypeface::PerGlyphInfo> : std::true_type {} ; 424 template <> struct is_bitmask_enum<SkTypeface::PerGlyphInfo> : std::true_type {} ;
428 } 425 }
429 426
430 #endif 427 #endif
OLDNEW
« no previous file with comments | « no previous file | include/ports/SkFontMgr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698