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

Side by Side Diff: src/utils/android/SkAndroidSDKCanvas.cpp

Issue 1263243003: fix tests for android framework build (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 4 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/utils/android/SkAndroidSDKCanvas.h ('k') | no next file » | 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 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 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 230
231 void SkAndroidSDKCanvas::onDrawImage(const SkImage* image, 231 void SkAndroidSDKCanvas::onDrawImage(const SkImage* image,
232 SkScalar x, 232 SkScalar x,
233 SkScalar y, 233 SkScalar y,
234 const SkPaint* paint) { 234 const SkPaint* paint) {
235 FILTER_PTR(paint); 235 FILTER_PTR(paint);
236 fProxyTarget->drawImage(image, x, y, filteredPaint); 236 fProxyTarget->drawImage(image, x, y, filteredPaint);
237 } 237 }
238 238
239 void SkAndroidSDKCanvas::onDrawImageRect(const SkImage* image, 239 void SkAndroidSDKCanvas::onDrawImageRect(const SkImage* image,
240 const SkRect* in, 240 const SkRect* in,
241 const SkRect& out, 241 const SkRect& out,
242 const SkPaint* paint) { 242 const SkPaint* paint
243 SrcRectConstraint constraint) {
243 FILTER_PTR(paint); 244 FILTER_PTR(paint);
244 fProxyTarget->drawImageRect(image, in, out, filteredPaint); 245 fProxyTarget->drawImageRect(image, in, out, filteredPaint, constraint);
245 } 246 }
246 247
247 void SkAndroidSDKCanvas::onDrawPicture(const SkPicture* picture, 248 void SkAndroidSDKCanvas::onDrawPicture(const SkPicture* picture,
248 const SkMatrix* matrix, 249 const SkMatrix* matrix,
249 const SkPaint* paint) { 250 const SkPaint* paint) {
250 FILTER_PTR(paint); 251 FILTER_PTR(paint);
251 fProxyTarget->drawPicture(picture, matrix, filteredPaint); 252 fProxyTarget->drawPicture(picture, matrix, filteredPaint);
252 } 253 }
253 254
254 void SkAndroidSDKCanvas::onDrawDrawable(SkDrawable* drawable, const SkMatrix* ma trix) { 255 void SkAndroidSDKCanvas::onDrawDrawable(SkDrawable* drawable, const SkMatrix* ma trix) {
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 fProxyTarget->clipPath(path, op, style); 341 fProxyTarget->clipPath(path, op, style);
341 } 342 }
342 343
343 void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op) { 344 void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op) {
344 fProxyTarget->clipRegion(region, op); 345 fProxyTarget->clipRegion(region, op);
345 } 346 }
346 347
347 void SkAndroidSDKCanvas::onDiscard() { fProxyTarget->discard(); } 348 void SkAndroidSDKCanvas::onDiscard() { fProxyTarget->discard(); }
348 349
349 350
OLDNEW
« no previous file with comments | « src/utils/android/SkAndroidSDKCanvas.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698