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

Side by Side Diff: src/fonts/SkGScalerContext.cpp

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 8 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/fonts/SkGScalerContext.h ('k') | src/fonts/SkTestScalerContext.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 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 "SkGScalerContext.h" 8 #include "SkGScalerContext.h"
9 #include "SkGlyph.h" 9 #include "SkGlyph.h"
10 #include "SkPath.h" 10 #include "SkPath.h"
11 #include "SkCanvas.h" 11 #include "SkCanvas.h"
12 12
13 class SkGScalerContext : public SkScalerContext { 13 class SkGScalerContext : public SkScalerContext {
14 public: 14 public:
15 SkGScalerContext(SkGTypeface*, const SkDescriptor*); 15 SkGScalerContext(SkGTypeface*, const SkDescriptor*);
16 virtual ~SkGScalerContext(); 16 virtual ~SkGScalerContext();
17 17
18 protected: 18 protected:
19 unsigned generateGlyphCount() SK_OVERRIDE; 19 unsigned generateGlyphCount() override;
20 uint16_t generateCharToGlyph(SkUnichar) SK_OVERRIDE; 20 uint16_t generateCharToGlyph(SkUnichar) override;
21 void generateAdvance(SkGlyph*) SK_OVERRIDE; 21 void generateAdvance(SkGlyph*) override;
22 void generateMetrics(SkGlyph*) SK_OVERRIDE; 22 void generateMetrics(SkGlyph*) override;
23 void generateImage(const SkGlyph&) SK_OVERRIDE; 23 void generateImage(const SkGlyph&) override;
24 void generatePath(const SkGlyph&, SkPath*) SK_OVERRIDE; 24 void generatePath(const SkGlyph&, SkPath*) override;
25 void generateFontMetrics(SkPaint::FontMetrics*) SK_OVERRIDE; 25 void generateFontMetrics(SkPaint::FontMetrics*) override;
26 26
27 private: 27 private:
28 SkGTypeface* fFace; 28 SkGTypeface* fFace;
29 SkScalerContext* fProxy; 29 SkScalerContext* fProxy;
30 SkMatrix fMatrix; 30 SkMatrix fMatrix;
31 }; 31 };
32 32
33 #define STD_SIZE 1 33 #define STD_SIZE 1
34 34
35 #include "SkDescriptor.h" 35 #include "SkDescriptor.h"
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 257
258 friend class SkGFontBuilder; 258 friend class SkGFontBuilder;
259 SkGFont(int count, Glyph* array); 259 SkGFont(int count, Glyph* array);
260 }; 260 };
261 261
262 class SkGFontBuilder { 262 class SkGFontBuilder {
263 public: 263 public:
264 264
265 }; 265 };
266 #endif 266 #endif
OLDNEW
« no previous file with comments | « src/fonts/SkGScalerContext.h ('k') | src/fonts/SkTestScalerContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698