diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 20:21:52 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-05 20:21:52 +0000 |
| commit | e758a237f0bc81a78dddcc349e503332c5469439 (patch) | |
| tree | 26db032ad9cf4bf7f10217d2741685373d498ea8 /android_webview | |
| parent | 864b73c7621db7180fc6a693cf353f8c49a7348e (diff) | |
| download | chromium_src-e758a237f0bc81a78dddcc349e503332c5469439.zip chromium_src-e758a237f0bc81a78dddcc349e503332c5469439.tar.gz chromium_src-e758a237f0bc81a78dddcc349e503332c5469439.tar.bz2 | |
don't create SkDevice directly, use SkBitmap or (better) SkCanvas::NewRaster factory
BUG=skia:2239
TBR=scherkus@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=254567
reopened (after revewer) to address media_unittest valgrind issue
Review URL: https://codereview.chromium.org/184743002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/browser/browser_view_renderer.cc | 7 | ||||
| -rw-r--r-- | android_webview/native/java_browser_view_renderer_helper.cc | 14 |
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); } |