| OLD | NEW |
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2011 Google Inc. | 3 * Copyright 2011 Google Inc. |
| 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 #ifndef SkProxyCanvas_DEFINED | 8 #ifndef SkProxyCanvas_DEFINED |
| 9 #define SkProxyCanvas_DEFINED | 9 #define SkProxyCanvas_DEFINED |
| 10 | 10 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 const uint16_t indices[], int indexCount, | 48 const uint16_t indices[], int indexCount, |
| 49 const SkPaint& paint) SK_OVERRIDE; | 49 const SkPaint& paint) SK_OVERRIDE; |
| 50 virtual void drawData(const void* data, size_t length) SK_OVERRIDE; | 50 virtual void drawData(const void* data, size_t length) SK_OVERRIDE; |
| 51 | 51 |
| 52 virtual void beginCommentGroup(const char* description) SK_OVERRIDE; | 52 virtual void beginCommentGroup(const char* description) SK_OVERRIDE; |
| 53 virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; | 53 virtual void addComment(const char* kywd, const char* value) SK_OVERRIDE; |
| 54 virtual void endCommentGroup() SK_OVERRIDE; | 54 virtual void endCommentGroup() SK_OVERRIDE; |
| 55 | 55 |
| 56 virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE; | 56 virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE; |
| 57 | 57 |
| 58 // Transitional, to facilitate migrating subclasses to the new willSave API. |
| 59 using SkCanvas::willSave; |
| 60 |
| 58 protected: | 61 protected: |
| 59 virtual void willSave(SaveFlags) SK_OVERRIDE; | 62 virtual void willSave(SaveFlags) SK_OVERRIDE; |
| 60 virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveF
lags) SK_OVERRIDE; | 63 virtual SaveLayerStrategy willSaveLayer(const SkRect*, const SkPaint*, SaveF
lags) SK_OVERRIDE; |
| 61 virtual void willRestore() SK_OVERRIDE; | 64 virtual void willRestore() SK_OVERRIDE; |
| 62 | 65 |
| 63 virtual void didConcat(const SkMatrix&) SK_OVERRIDE; | 66 virtual void didConcat(const SkMatrix&) SK_OVERRIDE; |
| 64 virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; | 67 virtual void didSetMatrix(const SkMatrix&) SK_OVERRIDE; |
| 65 | 68 |
| 66 virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK
_OVERRIDE; | 69 virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK
_OVERRIDE; |
| 67 virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkS
calar y, | 70 virtual void onDrawText(const void* text, size_t byteLength, SkScalar x, SkS
calar y, |
| (...skipping 12 matching lines...) Expand all Loading... |
| 80 | 83 |
| 81 virtual void onDrawPicture(const SkPicture*) SK_OVERRIDE; | 84 virtual void onDrawPicture(const SkPicture*) SK_OVERRIDE; |
| 82 | 85 |
| 83 private: | 86 private: |
| 84 SkCanvas* fProxy; | 87 SkCanvas* fProxy; |
| 85 | 88 |
| 86 typedef SkCanvas INHERITED; | 89 typedef SkCanvas INHERITED; |
| 87 }; | 90 }; |
| 88 | 91 |
| 89 #endif | 92 #endif |
| OLD | NEW |