Index: android_webview/native/java_browser_view_renderer_helper.cc |
diff --git a/android_webview/native/java_browser_view_renderer_helper.cc b/android_webview/native/java_browser_view_renderer_helper.cc |
index b6dd73caf2b2029cffa02b786ce74892286ae047..c0d1dd29b7502ed01bd66e8924aead17c1021f14 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); |
} |