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

Side by Side Diff: src/ports/SkFontConfigTypeface.h

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 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/SkFontConfigInterface_direct.cpp ('k') | src/ports/SkFontHost_FreeType.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 2013 Google Inc. 2 * Copyright 2013 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 "SkFontHost_FreeType_common.h" 9 #include "SkFontHost_FreeType_common.h"
10 #include "SkStream.h" 10 #include "SkStream.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 , fFamilyName(familyName) 59 , fFamilyName(familyName)
60 , fLocalStream(NULL) {} 60 , fLocalStream(NULL) {}
61 61
62 FontConfigTypeface(const SkFontStyle& style, bool fixedWidth, SkStream* loca lStream) 62 FontConfigTypeface(const SkFontStyle& style, bool fixedWidth, SkStream* loca lStream)
63 : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth) { 63 : INHERITED(style, SkTypefaceCache::NewFontID(), fixedWidth) {
64 // we default to empty fFamilyName and fIdentity 64 // we default to empty fFamilyName and fIdentity
65 fLocalStream = localStream; 65 fLocalStream = localStream;
66 SkSafeRef(localStream); 66 SkSafeRef(localStream);
67 } 67 }
68 68
69 virtual void onGetFamilyName(SkString* familyName) const SK_OVERRIDE; 69 void onGetFamilyName(SkString* familyName) const SK_OVERRIDE;
70 virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE ; 70 void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
71 virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; 71 SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
72 72
73 private: 73 private:
74 typedef SkTypeface_FreeType INHERITED; 74 typedef SkTypeface_FreeType INHERITED;
75 }; 75 };
OLDNEW
« no previous file with comments | « src/ports/SkFontConfigInterface_direct.cpp ('k') | src/ports/SkFontHost_FreeType.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698