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

Side by Side Diff: src/gpu/GrBitmapTextContext.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/gpu/GrAAConvexPathRenderer.cpp ('k') | src/gpu/GrDefaultGeoProcFactory.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 #ifndef GrBitmapTextContext_DEFINED 8 #ifndef GrBitmapTextContext_DEFINED
9 #define GrBitmapTextContext_DEFINED 9 #define GrBitmapTextContext_DEFINED
10 10
(...skipping 21 matching lines...) Expand all
32 GrTexture* fCurrTexture; 32 GrTexture* fCurrTexture;
33 GrMaskFormat fCurrMaskFormat; 33 GrMaskFormat fCurrMaskFormat;
34 SkAutoTUnref<const GrGeometryProcessor> fCachedGeometryProcessor; 34 SkAutoTUnref<const GrGeometryProcessor> fCachedGeometryProcessor;
35 SkAutoTUnref<const GrFragmentProcessor> fCachedTextureProcessor; 35 SkAutoTUnref<const GrFragmentProcessor> fCachedTextureProcessor;
36 // Used to check whether fCachedEffect is still valid. 36 // Used to check whether fCachedEffect is still valid.
37 uint32_t fEffectTextureUniqueID; 37 uint32_t fEffectTextureUniqueID;
38 SkMatrix fLocalMatrix; 38 SkMatrix fLocalMatrix;
39 39
40 GrBitmapTextContext(GrContext*, const SkDeviceProperties&); 40 GrBitmapTextContext(GrContext*, const SkDeviceProperties&);
41 41
42 virtual bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OV ERRIDE; 42 bool canDraw(const SkPaint& paint, const SkMatrix& viewMatrix) SK_OVERRIDE;
43 43
44 virtual void onDrawText(const GrPaint&, const SkPaint&, const SkMatrix& view Matrix, 44 virtual void onDrawText(const GrPaint&, const SkPaint&, const SkMatrix& view Matrix,
45 const char text[], size_t byteLength, 45 const char text[], size_t byteLength,
46 SkScalar x, SkScalar y) SK_OVERRIDE; 46 SkScalar x, SkScalar y) SK_OVERRIDE;
47 virtual void onDrawPosText(const GrPaint&, const SkPaint&, const SkMatrix& v iewMatrix, 47 virtual void onDrawPosText(const GrPaint&, const SkPaint&, const SkMatrix& v iewMatrix,
48 const char text[], size_t byteLength, 48 const char text[], size_t byteLength,
49 const SkScalar pos[], int scalarsPerPosition, 49 const SkScalar pos[], int scalarsPerPosition,
50 const SkPoint& offset) SK_OVERRIDE; 50 const SkPoint& offset) SK_OVERRIDE;
51 51
52 void init(const GrPaint&, const SkPaint&); 52 void init(const GrPaint&, const SkPaint&);
53 void appendGlyph(GrGlyph::PackedID, SkFixed left, SkFixed top, GrFontScaler* ); 53 void appendGlyph(GrGlyph::PackedID, SkFixed left, SkFixed top, GrFontScaler* );
54 bool uploadGlyph(GrGlyph*, GrFontScaler*); 54 bool uploadGlyph(GrGlyph*, GrFontScaler*);
55 void flush(); // automatically called by destructor 55 void flush(); // automatically called by destructor
56 void finish(); 56 void finish();
57 }; 57 };
58 58
59 #endif 59 #endif
OLDNEW
« no previous file with comments | « src/gpu/GrAAConvexPathRenderer.cpp ('k') | src/gpu/GrDefaultGeoProcFactory.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698