| OLD | NEW |
| 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 Loading... |
| 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 = MakeN32Premul(bitmap_info.width, bitmap_info.height); |
| 159 SkBitmap bitmap; | 159 SkBitmap bitmap; |
| 160 bitmap.setConfig(SkBitmap::kARGB_8888_Config, | 160 bitmap.installPixels(info, pixels, bitmap_info.stride); |
| 161 bitmap_info.width, | |
| 162 bitmap_info.height, | |
| 163 bitmap_info.stride); | |
| 164 bitmap.setPixels(pixels); | |
| 165 | 161 |
| 166 SkBitmapDevice device(bitmap); | 162 SkCanvas canvas(bitmap); |
| 167 SkCanvas canvas(&device); | |
| 168 canvas.translate(-scroll_x, -scroll_y); | 163 canvas.translate(-scroll_x, -scroll_y); |
| 169 succeeded = renderer.Run(&canvas); | 164 succeeded = renderer.Run(&canvas); |
| 170 } | 165 } |
| 171 | 166 |
| 172 if (AndroidBitmap_unlockPixels(env, jbitmap.obj()) < 0) { | 167 if (AndroidBitmap_unlockPixels(env, jbitmap.obj()) < 0) { |
| 173 LOG(ERROR) << "Error unlocking java bitmap pixels."; | 168 LOG(ERROR) << "Error unlocking java bitmap pixels."; |
| 174 return false; | 169 return false; |
| 175 } | 170 } |
| 176 | 171 |
| 177 return succeeded; | 172 return succeeded; |
| 178 } | 173 } |
| 179 | 174 |
| 180 } // namespace android_webview | 175 } // namespace android_webview |
| OLD | NEW |