Switch AwPixelInfo to wrap SkCanvasLayerState

android_webview/public/browser/draw_sw.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ANDROID_WEBVIEW_PUBLIC_BROWSER_DRAW_SW_H_
 #define ANDROID_WEBVIEW_PUBLIC_BROWSER_DRAW_SW_H_
 
 #include <jni.h>
 #include <stddef.h>
 
 #ifndef __cplusplus
 #error "Can't mix C and C++ when using jni.h"
 #endif
 
+struct 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.
+  SkCanvasState* state; // The externalize state in skia format.
+  // TODO(joth): Remove the rest in next patch.

[djsollen, 2013/09/05 12:10:07]

is there a benefit to deferring the removal to a later CL?  If not, let's clean
it up now when we are updating the struct's version.

[joth, 2013/09/05 16:10:34]

yeah... it's mostly so we have a clean compilation while the thing is merged
across repos and branches and what-not, otherwise I need to simultaneously land
this in 5 places.

That said, I see I've broken stuff anyway as this patch removes the 'config'
member and constants so I either need to fix that, or just delete it all as you
say.

[djsollen, 2013/09/05 16:23:44]

I'm fine if you want to do it in stages, but it may be more hassle than it's
worth.  I'll leave that decision to you though.

[joth, 2013/09/05 22:03:39]

Done.

   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.
   // NOTE: If you add more members, bump kAwPixelInfoVersion.
 };
@@ skipping 20 matching lines @@
 // "vtable" for the functions declared in this file. An instance must be set via
 // AwContents.setAwDrawSWFunctionTable
 struct AwDrawSWFunctionTable {
   AwAccessPixelsFunction* access_pixels;
   AwReleasePixelsFunction* release_pixels;
   AwCreatePictureFunction* create_picture;
   AwIsSkiaVersionCompatibleFunction* is_skia_version_compatible;
 };
 
 #endif  // ANDROID_WEBVIEW_PUBLIC_BROWSER_DRAW_SW_H_