| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 Google Inc. | 2 * Copyright 2015 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 "SkAndroidSDKCanvas.h" | 8 #include "SkAndroidSDKCanvas.h" |
| 9 | 9 |
| 10 #include "SkColorFilter.h" | 10 #include "SkColorFilter.h" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 const SkPaint* paint) { | 140 const SkPaint* paint) { |
| 141 FILTER_PTR(paint); | 141 FILTER_PTR(paint); |
| 142 fProxyTarget->drawBitmap(bitmap, left, top, filteredPaint); | 142 fProxyTarget->drawBitmap(bitmap, left, top, filteredPaint); |
| 143 } | 143 } |
| 144 void SkAndroidSDKCanvas::onDrawBitmapRect(const SkBitmap& bitmap, | 144 void SkAndroidSDKCanvas::onDrawBitmapRect(const SkBitmap& bitmap, |
| 145 const SkRect* src, | 145 const SkRect* src, |
| 146 const SkRect& dst, | 146 const SkRect& dst, |
| 147 const SkPaint* paint, | 147 const SkPaint* paint, |
| 148 SkCanvas::SrcRectConstraint c
onstraint) { | 148 SkCanvas::SrcRectConstraint c
onstraint) { |
| 149 FILTER_PTR(paint); | 149 FILTER_PTR(paint); |
| 150 fProxyTarget->drawBitmapRect(bitmap, src, dst, filteredPaint, constraint); | 150 fProxyTarget->legacy_drawBitmapRect(bitmap, src, dst, filteredPaint, constra
int); |
| 151 } | 151 } |
| 152 void SkAndroidSDKCanvas::onDrawBitmapNine(const SkBitmap& bitmap, | 152 void SkAndroidSDKCanvas::onDrawBitmapNine(const SkBitmap& bitmap, |
| 153 const SkIRect& center, | 153 const SkIRect& center, |
| 154 const SkRect& dst, | 154 const SkRect& dst, |
| 155 const SkPaint* paint) { | 155 const SkPaint* paint) { |
| 156 FILTER_PTR(paint); | 156 FILTER_PTR(paint); |
| 157 fProxyTarget->drawBitmapNine(bitmap, center, dst, filteredPaint); | 157 fProxyTarget->drawBitmapNine(bitmap, center, dst, filteredPaint); |
| 158 } | 158 } |
| 159 void SkAndroidSDKCanvas::onDrawSprite(const SkBitmap& bitmap, | 159 void SkAndroidSDKCanvas::onDrawSprite(const SkBitmap& bitmap, |
| 160 int left, | 160 int left, |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 FILTER_PTR(paint); | 237 FILTER_PTR(paint); |
| 238 fProxyTarget->drawImage(image, x, y, filteredPaint); | 238 fProxyTarget->drawImage(image, x, y, filteredPaint); |
| 239 } | 239 } |
| 240 | 240 |
| 241 void SkAndroidSDKCanvas::onDrawImageRect(const SkImage* image, | 241 void SkAndroidSDKCanvas::onDrawImageRect(const SkImage* image, |
| 242 const SkRect* in, | 242 const SkRect* in, |
| 243 const SkRect& out, | 243 const SkRect& out, |
| 244 const SkPaint* paint, | 244 const SkPaint* paint, |
| 245 SrcRectConstraint constraint) { | 245 SrcRectConstraint constraint) { |
| 246 FILTER_PTR(paint); | 246 FILTER_PTR(paint); |
| 247 fProxyTarget->drawImageRect(image, in, out, filteredPaint, constraint); | 247 fProxyTarget->legacy_drawImageRect(image, in, out, filteredPaint, constraint
); |
| 248 } | 248 } |
| 249 | 249 |
| 250 void SkAndroidSDKCanvas::onDrawPicture(const SkPicture* picture, | 250 void SkAndroidSDKCanvas::onDrawPicture(const SkPicture* picture, |
| 251 const SkMatrix* matrix, | 251 const SkMatrix* matrix, |
| 252 const SkPaint* paint) { | 252 const SkPaint* paint) { |
| 253 FILTER_PTR(paint); | 253 FILTER_PTR(paint); |
| 254 fProxyTarget->drawPicture(picture, matrix, filteredPaint); | 254 fProxyTarget->drawPicture(picture, matrix, filteredPaint); |
| 255 } | 255 } |
| 256 | 256 |
| 257 void SkAndroidSDKCanvas::onDrawDrawable(SkDrawable* drawable, const SkMatrix* ma
trix) { | 257 void SkAndroidSDKCanvas::onDrawDrawable(SkDrawable* drawable, const SkMatrix* ma
trix) { |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 fProxyTarget->clipPath(path, op, style); | 343 fProxyTarget->clipPath(path, op, style); |
| 344 } | 344 } |
| 345 | 345 |
| 346 void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op) { | 346 void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op) { |
| 347 fProxyTarget->clipRegion(region, op); | 347 fProxyTarget->clipRegion(region, op); |
| 348 } | 348 } |
| 349 | 349 |
| 350 void SkAndroidSDKCanvas::onDiscard() { fProxyTarget->discard(); } | 350 void SkAndroidSDKCanvas::onDiscard() { fProxyTarget->discard(); } |
| 351 | 351 |
| 352 | 352 |
| OLD | NEW |