Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2140)

Unified Diff: android_webview/native/java_browser_view_renderer_helper.cc

Issue 184743002: don't create SkDevice directly, use SkBitmap or (better) SkCanvas::NewRaster factory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert changes to media unittests til we understand valgrind errors Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/browser/browser_view_renderer.cc ('k') | cc/output/gl_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « android_webview/browser/browser_view_renderer.cc ('k') | cc/output/gl_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698