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

Side by Side 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, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « android_webview/browser/browser_view_renderer.cc ('k') | cc/output/gl_renderer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "android_webview/native/java_browser_view_renderer_helper.h" 5 #include "android_webview/native/java_browser_view_renderer_helper.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 8
9 #include "android_webview/public/browser/draw_sw.h" 9 #include "android_webview/public/browser/draw_sw.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
11 #include "jni/JavaBrowserViewRendererHelper_jni.h" 11 #include "jni/JavaBrowserViewRendererHelper_jni.h"
12 #include "third_party/skia/include/core/SkBitmap.h" 12 #include "third_party/skia/include/core/SkBitmap.h"
13 #include "third_party/skia/include/core/SkBitmapDevice.h"
14 #include "third_party/skia/include/utils/SkCanvasStateUtils.h" 13 #include "third_party/skia/include/utils/SkCanvasStateUtils.h"
15 14
16 using base::android::JavaRef; 15 using base::android::JavaRef;
17 using base::android::ScopedJavaLocalRef; 16 using base::android::ScopedJavaLocalRef;
18 17
19 namespace android_webview { 18 namespace android_webview {
20 19
21 namespace { 20 namespace {
22 21
23 // Provides software rendering functions from the Android glue layer. 22 // Provides software rendering functions from the Android glue layer.
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 } 148 }
150 149
151 void* pixels = NULL; 150 void* pixels = NULL;
152 if (AndroidBitmap_lockPixels(env, jbitmap.obj(), &pixels) < 0) { 151 if (AndroidBitmap_lockPixels(env, jbitmap.obj(), &pixels) < 0) {
153 LOG(ERROR) << "Error locking java bitmap pixels."; 152 LOG(ERROR) << "Error locking java bitmap pixels.";
154 return false; 153 return false;
155 } 154 }
156 155
157 bool succeeded; 156 bool succeeded;
158 { 157 {
158 SkImageInfo info =
159 SkImageInfo::MakeN32Premul(bitmap_info.width, bitmap_info.height);
159 SkBitmap bitmap; 160 SkBitmap bitmap;
160 bitmap.setConfig(SkBitmap::kARGB_8888_Config, 161 bitmap.installPixels(info, pixels, bitmap_info.stride);
161 bitmap_info.width,
162 bitmap_info.height,
163 bitmap_info.stride);
164 bitmap.setPixels(pixels);
165 162
166 SkBitmapDevice device(bitmap); 163 SkCanvas canvas(bitmap);
167 SkCanvas canvas(&device);
168 canvas.translate(-scroll_x, -scroll_y); 164 canvas.translate(-scroll_x, -scroll_y);
169 succeeded = renderer.Run(&canvas); 165 succeeded = renderer.Run(&canvas);
170 } 166 }
171 167
172 if (AndroidBitmap_unlockPixels(env, jbitmap.obj()) < 0) { 168 if (AndroidBitmap_unlockPixels(env, jbitmap.obj()) < 0) {
173 LOG(ERROR) << "Error unlocking java bitmap pixels."; 169 LOG(ERROR) << "Error unlocking java bitmap pixels.";
174 return false; 170 return false;
175 } 171 }
176 172
177 return succeeded; 173 return succeeded;
178 } 174 }
179 175
180 } // namespace android_webview 176 } // namespace android_webview
OLDNEW
« 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