| 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 #include "SkProxyCanvas.h" | 8 #include "SkProxyCanvas.h" |
| 9 | 9 |
| 10 SkProxyCanvas::SkProxyCanvas(SkCanvas* proxy) : fProxy(proxy) { | 10 SkProxyCanvas::SkProxyCanvas(SkCanvas* proxy) : fProxy(proxy) { |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 this->INHERITED::willSaveLayer(bounds, paint, flags); | 32 this->INHERITED::willSaveLayer(bounds, paint, flags); |
| 33 // No need for a layer. | 33 // No need for a layer. |
| 34 return kNoLayer_SaveLayerStrategy; | 34 return kNoLayer_SaveLayerStrategy; |
| 35 } | 35 } |
| 36 | 36 |
| 37 void SkProxyCanvas::willRestore() { | 37 void SkProxyCanvas::willRestore() { |
| 38 fProxy->restore(); | 38 fProxy->restore(); |
| 39 this->INHERITED::willRestore(); | 39 this->INHERITED::willRestore(); |
| 40 } | 40 } |
| 41 | 41 |
| 42 bool SkProxyCanvas::translate(SkScalar dx, SkScalar dy) { | 42 void SkProxyCanvas::didTranslate(SkScalar dx, SkScalar dy) { |
| 43 return fProxy->translate(dx, dy); | 43 fProxy->translate(dx, dy); |
| 44 this->INHERITED::didTranslate(dx, dy); |
| 44 } | 45 } |
| 45 | 46 |
| 46 bool SkProxyCanvas::scale(SkScalar sx, SkScalar sy) { | 47 void SkProxyCanvas::didScale(SkScalar sx, SkScalar sy) { |
| 47 return fProxy->scale(sx, sy); | 48 fProxy->scale(sx, sy); |
| 49 this->INHERITED::didScale(sx, sy); |
| 48 } | 50 } |
| 49 | 51 |
| 50 bool SkProxyCanvas::rotate(SkScalar degrees) { | 52 void SkProxyCanvas::didRotate(SkScalar degrees) { |
| 51 return fProxy->rotate(degrees); | 53 fProxy->rotate(degrees); |
| 54 this->INHERITED::didRotate(degrees); |
| 52 } | 55 } |
| 53 | 56 |
| 54 bool SkProxyCanvas::skew(SkScalar sx, SkScalar sy) { | 57 void SkProxyCanvas::didSkew(SkScalar sx, SkScalar sy) { |
| 55 return fProxy->skew(sx, sy); | 58 fProxy->skew(sx, sy); |
| 59 this->INHERITED::didSkew(sx, sy); |
| 56 } | 60 } |
| 57 | 61 |
| 58 bool SkProxyCanvas::concat(const SkMatrix& matrix) { | 62 void SkProxyCanvas::didConcat(const SkMatrix& matrix) { |
| 59 return fProxy->concat(matrix); | 63 fProxy->concat(matrix); |
| 64 this->INHERITED::didConcat(matrix); |
| 60 } | 65 } |
| 61 | 66 |
| 62 void SkProxyCanvas::setMatrix(const SkMatrix& matrix) { | 67 void SkProxyCanvas::didSetMatrix(const SkMatrix& matrix) { |
| 63 fProxy->setMatrix(matrix); | 68 fProxy->setMatrix(matrix); |
| 69 this->INHERITED::didSetMatrix(matrix); |
| 64 } | 70 } |
| 65 | 71 |
| 66 void SkProxyCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyl
e edgeStyle) { | 72 void SkProxyCanvas::onClipRect(const SkRect& rect, SkRegion::Op op, ClipEdgeStyl
e edgeStyle) { |
| 67 fProxy->clipRect(rect, op, kSoft_ClipEdgeStyle == edgeStyle); | 73 fProxy->clipRect(rect, op, kSoft_ClipEdgeStyle == edgeStyle); |
| 68 } | 74 } |
| 69 | 75 |
| 70 void SkProxyCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeS
tyle edgeStyle) { | 76 void SkProxyCanvas::onClipRRect(const SkRRect& rrect, SkRegion::Op op, ClipEdgeS
tyle edgeStyle) { |
| 71 fProxy->clipRRect(rrect, op, kSoft_ClipEdgeStyle == edgeStyle); | 77 fProxy->clipRRect(rrect, op, kSoft_ClipEdgeStyle == edgeStyle); |
| 72 } | 78 } |
| 73 | 79 |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 fProxy->endCommentGroup(); | 187 fProxy->endCommentGroup(); |
| 182 } | 188 } |
| 183 | 189 |
| 184 SkBounder* SkProxyCanvas::setBounder(SkBounder* bounder) { | 190 SkBounder* SkProxyCanvas::setBounder(SkBounder* bounder) { |
| 185 return fProxy->setBounder(bounder); | 191 return fProxy->setBounder(bounder); |
| 186 } | 192 } |
| 187 | 193 |
| 188 SkDrawFilter* SkProxyCanvas::setDrawFilter(SkDrawFilter* filter) { | 194 SkDrawFilter* SkProxyCanvas::setDrawFilter(SkDrawFilter* filter) { |
| 189 return fProxy->setDrawFilter(filter); | 195 return fProxy->setDrawFilter(filter); |
| 190 } | 196 } |
| OLD | NEW |