Chromium Code Reviews| 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..9734d00aa4fab3e9fdbff7bfcbab350dd66a04f6 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,11 @@ bool JavaBrowserViewRendererHelper::RasterizeIntoBitmap( |
| bool succeeded; |
| { |
| + SkImageInfo info = MakeN32Premul(bitmap_info.width, bitmap_info.height); |
|
boliu
2014/02/28 19:36:31
SkImageInfo::MakeN32Premul
reed1
2014/02/28 19:52:09
Done.
|
| 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); |
| } |