commit 98fa4f9e7b33a3004ce9142c9acd4300391b9a0e
author sergeyv <sergeyv@google.com> Mon Oct 24 15:35:21 2016 -0700
committer sergeyv <sergeyv@google.com> Wed Oct 26 13:57:38 2016 -0700
tree 362ddb4cd164347c2008810d030c954d7dc2c778
parent 817695589c80cfc0913d94e3dd52dac2782e8ed6

Use Bitmap in Texture.upload

Test: refactoring cl.
bug:32216791

Change-Id: Ib0b16c878d8371e0471e9a502f55626ec5999c60

libs/hwui/Texture.h

diff --git a/libs/hwui/Texture.h b/libs/hwui/Texture.h
index aa8a6d3..57cfc2b 100644
--- a/libs/hwui/Texture.h
+++ b/libs/hwui/Texture.h
@@ -18,9 +18,9 @@
 #define ANDROID_HWUI_TEXTURE_H
 
 #include "GpuMemoryTracker.h"
+#include "hwui/Bitmap.h"
 
 #include <GLES2/gl2.h>
-#include <SkBitmap.h>
 
 namespace android {
 namespace uirenderer {
@@ -74,13 +74,13 @@
     }
 
     /**
-     * Updates this Texture with the contents of the provided SkBitmap,
+     * Updates this Texture with the contents of the provided Bitmap,
      * also setting the appropriate width, height, and format. It is not necessary
      * to call resize() prior to this.
      *
-     * Note this does not set the generation from the SkBitmap.
+     * Note this does not set the generation from the Bitmap.
      */
-    void upload(const SkBitmap& source);
+    void upload(Bitmap& source);
 
     /**
      * Basically glTexImage2D/glTexSubImage2D.