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/RecordingCanvas.cpp

diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp
index a4c1d1b..2730ed9 100644
--- a/libs/hwui/RecordingCanvas.cpp
+++ b/libs/hwui/RecordingCanvas.cpp
@@ -21,6 +21,7 @@
 #include "RenderNode.h"
 #include "VectorDrawable.h"
 #include "hwui/MinikinUtils.h"
+#include "hwui/Bitmap.h"
 
 namespace android {
 namespace uirenderer {
@@ -468,10 +469,12 @@
 }
 
 // Bitmap-based
-void RecordingCanvas::drawBitmap(const SkBitmap& bitmap, float left, float top, const SkPaint* paint) {
+void RecordingCanvas::drawBitmap(Bitmap& bitmap, float left, float top, const SkPaint* paint) {
+    SkBitmap skBitmap;
+    bitmap.getSkBitmap(&skBitmap);
     save(SaveFlags::Matrix);
     translate(left, top);
-    drawBitmap(&bitmap, paint);
+    drawBitmap(&skBitmap, paint);
     restore();
 }