Switch AwPixelInfo to wrap SkCanvasLayerState

Using the new skia utility makes the canvas stack export much simpler

BUG=

Review URL: https://chromiumcodereview.appspot.com/23789003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221593 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 17 deletions

diff --git a/android_webview/public/browser/draw_sw.h b/android_webview/public/browser/draw_sw.h
index 463f59c..3f14798 100644
--- a/android_webview/public/browser/draw_sw.h
+++ b/android_webview/public/browser/draw_sw.h
@@ -12,29 +12,15 @@
 #error "Can't mix C and C++ when using jni.h"
 #endif
 
+class SkCanvasState;
 class SkPicture;
 
-static const int kAwPixelInfoVersion = 2;
-
-// Values of the AwPixelInfo::config field.
-enum AwPixelConfig {
-  AwConfig_RGB_565 = 4,
-  AwConfig_ARGB_4444 = 5,
-  AwConfig_ARGB_8888 = 6,
-};
+static const int kAwPixelInfoVersion = 3;
 
 // Holds the information required to implement the SW draw to system canvas.
 struct AwPixelInfo {
   int version;          // The kAwPixelInfoVersion this struct was built with.
-  int config;           // |pixel| format: a value from AwPixelConfig.
-  int width;            // In pixels.
-  int height;           // In pixels.
-  int row_bytes;        // Number of bytes from start of one line to next.
-  void* pixels;         // The pixels, all (height * row_bytes) of them.
-  // The Matrix and Clip are relative to |pixels|, not the source canvas.
-  float matrix[9];      // The matrix currently in effect on the canvas.
-  int clip_rect_count;  // Number of rects in |clip_rects|.
-  int* clip_rects;      // Clip area: 4 ints per rect in {x,y,w,h} format.
+  SkCanvasState* state; // The externalize state in skia format.
   // NOTE: If you add more members, bump kAwPixelInfoVersion.
 };