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

2 files changed, 39 insertions, 86 deletions

diff --git a/android_webview/browser/in_process_view_renderer.cc b/android_webview/browser/in_process_view_renderer.cc
index 7964cfd..aebf732 100644
--- a/android_webview/browser/in_process_view_renderer.cc
+++ b/android_webview/browser/in_process_view_renderer.cc
@@ -27,6 +27,7 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 #include "third_party/skia/include/core/SkPicture.h"
+#include "third_party/skia/include/utils/SkCanvasStateUtils.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/vector2d_conversions.h"
@@ -454,82 +455,48 @@ bool InProcessViewRenderer::RenderViaAuxilaryBitmapIfNeeded(
   JNIEnv* env = AttachCurrentThread();
   ScopedPixelAccess auto_release_pixels(env, java_canvas);
   AwPixelInfo* pixels = auto_release_pixels.pixels();
-  SkMatrix matrix;
-  SkBitmap::Config config(SkBitmap::kNo_Config);
-  if (pixels) {
-    switch (pixels->config) {
-      case AwConfig_ARGB_8888:
-        config = SkBitmap::kARGB_8888_Config;
-        break;
-      case AwConfig_RGB_565:
-        config = SkBitmap::kRGB_565_Config;
-        break;
+  if (pixels && pixels->state) {
+    skia::RefPtr<SkCanvas> canvas = skia::AdoptRef(
+        SkCanvasStateUtils::CreateFromCanvasState(pixels->state));
+
+    // Workarounds for http://crbug.com/271096: SW draw only supports
+    // translate & scale transforms, and a simple rectangular clip.
+    if (canvas && (!canvas->getTotalClip().isRect() ||
+          (canvas->getTotalMatrix().getType() &
+           ~(SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask)))) {
+      canvas.clear();
     }
-
-    for (int i = 0; i < 9; i++) {
-      matrix.set(i, pixels->matrix[i]);
-    }
-    // Workaround for http://crbug.com/271096: SW draw only supports
-    // translate & scale transforms.
-    if (matrix.getType() & ~(SkMatrix::kTranslate_Mask | SkMatrix::kScale_Mask))
-      config = SkBitmap::kNo_Config;
-  }
-
-  if (config == SkBitmap::kNo_Config) {
-    // Render into an auxiliary bitmap if pixel info is not available.
-    ScopedJavaLocalRef<jobject> jcanvas(env, java_canvas);
-    TRACE_EVENT0("android_webview", "RenderToAuxBitmap");
-    ScopedJavaLocalRef<jobject> jbitmap(java_helper->CreateBitmap(
-        env, clip.width(), clip.height(), jcanvas, owner_key));
-    if (!jbitmap.obj()) {
-      TRACE_EVENT_INSTANT0("android_webview",
-                           "EarlyOut_BitmapAllocFail",
-                           TRACE_EVENT_SCOPE_THREAD);
-      return false;
-    }
-
-    if (!RasterizeIntoBitmap(env, jbitmap,
-                             clip.x() - scroll_correction.x(),
-                             clip.y() - scroll_correction.y(),
-                             render_source)) {
-      TRACE_EVENT_INSTANT0("android_webview",
-                           "EarlyOut_RasterizeFail",
-                           TRACE_EVENT_SCOPE_THREAD);
-      return false;
+    if (canvas) {
+      canvas->translate(scroll_correction.x(), scroll_correction.y());
+      return render_source.Run(canvas.get());
     }
-
-    java_helper->DrawBitmapIntoCanvas(env, jbitmap, jcanvas,
-                                      clip.x(), clip.y());
-    return true;
   }
 
-  // Draw in a SkCanvas built over the pixel information.
-  SkBitmap bitmap;
-  bitmap.setConfig(config,
-                   pixels->width,
-                   pixels->height,
-                   pixels->row_bytes);
-  bitmap.setPixels(pixels->pixels);
-  SkBitmapDevice device(bitmap);
-  SkCanvas canvas(&device);
-  canvas.setMatrix(matrix);
-
-  if (pixels->clip_rect_count) {
-    SkRegion clip;
-    for (int i = 0; i < pixels->clip_rect_count; ++i) {
-      clip.op(SkIRect::MakeXYWH(pixels->clip_rects[i + 0],
-                                pixels->clip_rects[i + 1],
-                                pixels->clip_rects[i + 2],
-                                pixels->clip_rects[i + 3]),
-              SkRegion::kUnion_Op);
-    }
-    canvas.setClipRegion(clip);
+  // Render into an auxiliary bitmap if pixel info is not available.
+  ScopedJavaLocalRef<jobject> jcanvas(env, java_canvas);
+  TRACE_EVENT0("android_webview", "RenderToAuxBitmap");
+  ScopedJavaLocalRef<jobject> jbitmap(java_helper->CreateBitmap(
+      env, clip.width(), clip.height(), jcanvas, owner_key));
+  if (!jbitmap.obj()) {
+    TRACE_EVENT_INSTANT0("android_webview",
+                         "EarlyOut_BitmapAllocFail",
+                         TRACE_EVENT_SCOPE_THREAD);
+    return false;
   }
 
-  canvas.translate(scroll_correction.x(),
-                   scroll_correction.y());
+  if (!RasterizeIntoBitmap(env, jbitmap,
+                           clip.x() - scroll_correction.x(),
+                           clip.y() - scroll_correction.y(),
+                           render_source)) {
+    TRACE_EVENT_INSTANT0("android_webview",
+                         "EarlyOut_RasterizeFail",
+                         TRACE_EVENT_SCOPE_THREAD);
+    return false;
+  }
 
-  return render_source.Run(&canvas);
+  java_helper->DrawBitmapIntoCanvas(env, jbitmap, jcanvas,
+                                    clip.x(), clip.y());
+  return true;
 }
 
 skia::RefPtr<SkPicture> InProcessViewRenderer::CapturePicture(int width,
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.
 };