2 files changed, 9 insertions, 12 deletions
diff --git a/android_webview/browser/browser_view_renderer.cc b/android_webview/browser/browser_view_renderer.cc
index 526f5b6..32cb906 100644
--- a/android_webview/browser/browser_view_renderer.cc
+++ b/android_webview/browser/browser_view_renderer.cc
@@ -16,7 +16,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.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/SkPicture.h"
 #include "ui/gfx/vector2d_conversions.h"
@@ -441,8 +440,10 @@ void BrowserViewRenderer::FallbackTickFired() {
 
 void BrowserViewRenderer::ForceFakeCompositeSW() {
   DCHECK(has_compositor_);
-  SkBitmapDevice device(SkBitmap::kARGB_8888_Config, 1, 1);
-  SkCanvas canvas(&device);
+  SkBitmap bitmap;
+  bitmap.allocN32Pixels(1, 1);
+  bitmap.eraseColor(0);
+  SkCanvas canvas(bitmap);
   CompositeSW(&canvas);
 }
 
diff --git a/android_webview/native/java_browser_view_renderer_helper.cc b/android_webview/native/java_browser_view_renderer_helper.cc
index b6dd73c..c0d1dd2 100644
--- a/android_webview/native/java_browser_view_renderer_helper.cc
+++ b/android_webview/native/java_browser_view_renderer_helper.cc
@@ -10,7 +10,6 @@
 #include "base/debug/trace_event.h"
 #include "jni/JavaBrowserViewRendererHelper_jni.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkBitmapDevice.h"
 #include "third_party/skia/include/utils/SkCanvasStateUtils.h"
 
 using base::android::JavaRef;
@@ -156,15 +155,12 @@ bool JavaBrowserViewRendererHelper::RasterizeIntoBitmap(
 
   bool succeeded;
   {
+    SkImageInfo info =
+        SkImageInfo::MakeN32Premul(bitmap_info.width, bitmap_info.height);
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kARGB_8888_Config,
-                     bitmap_info.width,
-                     bitmap_info.height,
-                     bitmap_info.stride);
-    bitmap.setPixels(pixels);
-
-    SkBitmapDevice device(bitmap);
-    SkCanvas canvas(&device);
+    bitmap.installPixels(info, pixels, bitmap_info.stride);
+
+    SkCanvas canvas(bitmap);
     canvas.translate(-scroll_x, -scroll_y);
     succeeded = renderer.Run(&canvas);
   }