commit fc9999505a36c66892d7ccce85187936105f4f36
author sergeyv <sergeyv@google.com> Mon Oct 17 13:07:38 2016 -0700
committer sergeyv <sergeyv@google.com> Thu Oct 20 14:04:35 2016 -0700
tree aed3f3fced5395d194840fb4a035a8f7fa7fa96e
parent aed7f58fb05a25ce2112829e77c0eb5dd268e8a7

Pass Bitmap instead of SkBitmap for bitmap rect operation
Test: refactoring cl.
bug:32216791

Change-Id: I66d19194c57b3aa2c400aa87acffc774a533776a

libs/hwui/FrameBuilder.cpp

diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp
index f35d605..f2ae847 100644
--- a/libs/hwui/FrameBuilder.cpp
+++ b/libs/hwui/FrameBuilder.cpp
@@ -631,13 +631,15 @@
 }
 
 void FrameBuilder::deferVectorDrawableOp(const VectorDrawableOp& op) {
-    const SkBitmap& bitmap = op.vectorDrawable->getBitmapUpdateIfDirty();
+    SkBitmap bitmap;
+    op.vectorDrawable->getBitmapUpdateIfDirty().getSkBitmap(&bitmap);
+    SkBitmap* localBitmap = mAllocator.create<SkBitmap>(bitmap);
     SkPaint* paint = op.vectorDrawable->getPaint();
     const BitmapRectOp* resolvedOp = mAllocator.create_trivial<BitmapRectOp>(op.unmappedBounds,
             op.localMatrix,
             op.localClip,
             paint,
-            &bitmap,
+            localBitmap,
             Rect(bitmap.width(), bitmap.height()));
     deferBitmapRectOp(*resolvedOp);
 }