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

Side by Side Diff: android_webview/native/java_browser_view_renderer_helper.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 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
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/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 AuxiliaryCanvasHolder::AuxiliaryCanvasHolder( 95 AuxiliaryCanvasHolder::AuxiliaryCanvasHolder(
96 JNIEnv* env, 96 JNIEnv* env,
97 jobject java_canvas, 97 jobject java_canvas,
98 const gfx::Vector2d& scroll_correction, 98 const gfx::Vector2d& scroll_correction,
99 const gfx::Size size) 99 const gfx::Size size)
100 : jcanvas_(env, java_canvas), scroll_(scroll_correction) { 100 : jcanvas_(env, java_canvas), scroll_(scroll_correction) {
101 DCHECK(size.width() > 0); 101 DCHECK(size.width() > 0);
102 DCHECK(size.height() > 0); 102 DCHECK(size.height() > 0);
103 jbitmap_ = Java_JavaBrowserViewRendererHelper_createBitmap( 103 jbitmap_ = Java_JavaBrowserViewRendererHelper_createBitmap(
104 env, size.width(), size.height(), jcanvas_.obj()); 104 env, size.width(), size.height(), jcanvas_);
105 if (!jbitmap_.obj()) 105 if (!jbitmap_.obj())
106 return; 106 return;
107 107
108 AndroidBitmapInfo bitmap_info; 108 AndroidBitmapInfo bitmap_info;
109 if (AndroidBitmap_getInfo(env, jbitmap_.obj(), &bitmap_info) < 0) { 109 if (AndroidBitmap_getInfo(env, jbitmap_.obj(), &bitmap_info) < 0) {
110 LOG(ERROR) << "Error getting java bitmap info."; 110 LOG(ERROR) << "Error getting java bitmap info.";
111 return; 111 return;
112 } 112 }
113 113
114 void* pixels = nullptr; 114 void* pixels = nullptr;
(...skipping 12 matching lines...) Expand all
127 AuxiliaryCanvasHolder::~AuxiliaryCanvasHolder() { 127 AuxiliaryCanvasHolder::~AuxiliaryCanvasHolder() {
128 bitmap_.reset(); 128 bitmap_.reset();
129 129
130 JNIEnv* env = base::android::AttachCurrentThread(); 130 JNIEnv* env = base::android::AttachCurrentThread();
131 if (AndroidBitmap_unlockPixels(env, jbitmap_.obj()) < 0) { 131 if (AndroidBitmap_unlockPixels(env, jbitmap_.obj()) < 0) {
132 LOG(ERROR) << "Error unlocking java bitmap pixels."; 132 LOG(ERROR) << "Error unlocking java bitmap pixels.";
133 return; 133 return;
134 } 134 }
135 135
136 Java_JavaBrowserViewRendererHelper_drawBitmapIntoCanvas( 136 Java_JavaBrowserViewRendererHelper_drawBitmapIntoCanvas(
137 env, jbitmap_.obj(), jcanvas_.obj(), scroll_.x(), scroll_.y()); 137 env, jbitmap_, jcanvas_, scroll_.x(), scroll_.y());
138 } 138 }
139 139
140 SkCanvas* AuxiliaryCanvasHolder::GetCanvas() { 140 SkCanvas* AuxiliaryCanvasHolder::GetCanvas() {
141 return canvas_.get(); 141 return canvas_.get();
142 } 142 }
143 143
144 } // namespace 144 } // namespace
145 145
146 void RasterHelperSetAwDrawSWFunctionTable(AwDrawSWFunctionTable* table) { 146 void RasterHelperSetAwDrawSWFunctionTable(AwDrawSWFunctionTable* table) {
147 g_sw_draw_functions = table; 147 g_sw_draw_functions = table;
(...skipping 15 matching lines...) Expand all
163 holder.reset(new AuxiliaryCanvasHolder(env, java_canvas, scroll_correction, 163 holder.reset(new AuxiliaryCanvasHolder(env, java_canvas, scroll_correction,
164 auxiliary_bitmap_size)); 164 auxiliary_bitmap_size));
165 } 165 }
166 if (!holder->GetCanvas()) { 166 if (!holder->GetCanvas()) {
167 holder.reset(); 167 holder.reset();
168 } 168 }
169 return holder; 169 return holder;
170 } 170 }
171 171
172 } // namespace android_webview 172 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/native/input_stream_impl.cc ('k') | android_webview/native/permission/aw_permission_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698