Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

android_webview/browser/in_process_view_renderer.cc

 // Copyright 2013 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.
 
 #include "android_webview/browser/in_process_view_renderer.h"
 
 #include <android/bitmap.h>
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/scoped_app_gl_state_restore.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/public/browser/draw_gl.h"
 #include "android_webview/public/browser/draw_sw.h"
 #include "base/android/jni_android.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "gpu/command_buffer/service/in_process_command_buffer.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/core/SkCanvas.h"
-#include "third_party/skia/include/core/SkDevice.h"
 #include "third_party/skia/include/core/SkGraphics.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/vector2d_conversions.h"
 #include "ui/gfx/vector2d_f.h"
 
 using base::android::AttachCurrentThread;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
@@ skipping 46 matching lines @@
 
   bool succeeded;
   {
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config,
                      bitmap_info.width,
                      bitmap_info.height,
                      bitmap_info.stride);
     bitmap.setPixels(pixels);
 
-    SkDevice device(bitmap);
+    SkBitmapDevice device(bitmap);
     SkCanvas canvas(&device);
     canvas.translate(-scroll_x, -scroll_y);
     succeeded = renderer.Run(&canvas);
   }
 
   if (AndroidBitmap_unlockPixels(env, jbitmap.obj()) < 0) {
     LOG(ERROR) << "Error unlocking java bitmap pixels.";
     return false;
   }
 
@@ skipping 393 matching lines @@
     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);
-  SkDevice device(bitmap);
+  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]),
@@ skipping 276 matching lines @@
 void InProcessViewRenderer::FallbackTickFired() {
   TRACE_EVENT1("android_webview",
                "InProcessViewRenderer::FallbackTickFired",
                "compositor_needs_continuous_invalidate_",
                compositor_needs_continuous_invalidate_);
 
   // This should only be called if OnDraw or DrawGL did not come in time, which
   // means block_invalidates_ must still be true.
   DCHECK(block_invalidates_);
   if (compositor_needs_continuous_invalidate_ && compositor_) {
-    SkDevice device(SkBitmap::kARGB_8888_Config, 1, 1);
+    SkBitmapDevice device(SkBitmap::kARGB_8888_Config, 1, 1);
     SkCanvas canvas(&device);
     block_invalidates_ = true;
     CompositeSW(&canvas);
   }
   block_invalidates_ = false;
   EnsureContinuousInvalidation(NULL, false);
 }
 
 bool InProcessViewRenderer::CompositeSW(SkCanvas* canvas) {
   DCHECK(compositor_);
@@ skipping 36 matching lines @@
     base::StringAppendF(&str,
                         "surface width height: [%d %d] ",
                         draw_info->width,
                         draw_info->height);
     base::StringAppendF(&str, "is_layer: %d ", draw_info->is_layer);
   }
   return str;
 }
 
 }  // namespace android_webview