From d40e89258e0baa903f8fa9599dde12ed995b40c0 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Mon, 15 Dec 2014 16:19:43 -0500 Subject: [PATCH] Remove dependence on SK_LEGACY_PICTURE_DRAW_API. Call SkPicture::playback() instead of ::draw(). Also, no need longer need the const_cast. Change-Id: I4742d2fd5c5b918db492ec2ef6a84ea7d6151cdd --- core/jni/android/graphics/Picture.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/jni/android/graphics/Picture.cpp b/core/jni/android/graphics/Picture.cpp index d048a29a35a89..40805ae1ddb6a 100644 --- a/core/jni/android/graphics/Picture.cpp +++ b/core/jni/android/graphics/Picture.cpp @@ -106,8 +106,7 @@ void Picture::draw(Canvas* canvas) { SkASSERT(NULL != mPicture.get()); } if (NULL != mPicture.get()) { - // TODO: remove this const_cast once pictures are immutable - const_cast(mPicture.get())->draw(canvas->getSkCanvas()); + mPicture.get()->playback(canvas->getSkCanvas()); } }