commit aed7f58fb05a25ce2112829e77c0eb5dd268e8a7
author sergeyv <sergeyv@google.com> Fri Oct 14 16:30:21 2016 -0700
committer sergeyv <sergeyv@google.com> Thu Oct 20 09:50:49 2016 -0700
tree 2fa5031630aca8c4387a0e66675469284a5f0068
parent c1c54062f8cc9d47bdea820ae5ab6aef260b4488

Pass Bitmap instead of SkBitmap in canvas.drawBitmap(Bitmap, float,float,Paint)
Test: refactoring cl.
bug:32216791

Change-Id: If9f9fbc19e683b14cce6c3c268258bd832d495d2

libs/hwui/SkiaCanvasProxy.cpp

diff --git a/libs/hwui/SkiaCanvasProxy.cpp b/libs/hwui/SkiaCanvasProxy.cpp
index fded604..6620458 100644
--- a/libs/hwui/SkiaCanvasProxy.cpp
+++ b/libs/hwui/SkiaCanvasProxy.cpp
@@ -16,6 +16,8 @@
 
 #include "SkiaCanvasProxy.h"
 
+#include "hwui/Bitmap.h"
+
 #include <cutils/log.h>
 #include <SkPatchUtils.h>
 #include <SkPaint.h>
@@ -122,7 +124,8 @@
                             top + bitmap.dimensions().height(),
                             paint);
     } else {
-        mCanvas->drawBitmap(bitmap, left, top, paint);
+        auto hwuiBitmap= Bitmap::createFrom(bitmap.info(), *pxRef);
+        mCanvas->drawBitmap(*hwuiBitmap, left, top, paint);
     }
 }