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

Side by Side Diff: ui/android/resources/resource_manager_impl.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
« no previous file with comments | « remoting/host/android/jni_host.cc ('k') | ui/android/view_android.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ui/android/resources/resource_manager_impl.h" 5 #include "ui/android/resources/resource_manager_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 16 matching lines...) Expand all
27 // static 27 // static
28 ResourceManagerImpl* ResourceManagerImpl::FromJavaObject(jobject jobj) { 28 ResourceManagerImpl* ResourceManagerImpl::FromJavaObject(jobject jobj) {
29 return reinterpret_cast<ResourceManagerImpl*>( 29 return reinterpret_cast<ResourceManagerImpl*>(
30 Java_ResourceManager_getNativePtr(base::android::AttachCurrentThread(), 30 Java_ResourceManager_getNativePtr(base::android::AttachCurrentThread(),
31 jobj)); 31 jobj));
32 } 32 }
33 33
34 ResourceManagerImpl::ResourceManagerImpl(gfx::NativeWindow native_window) 34 ResourceManagerImpl::ResourceManagerImpl(gfx::NativeWindow native_window)
35 : host_(nullptr) { 35 : host_(nullptr) {
36 JNIEnv* env = base::android::AttachCurrentThread(); 36 JNIEnv* env = base::android::AttachCurrentThread();
37 java_obj_.Reset(env, Java_ResourceManager_create( 37 java_obj_.Reset(
38 env, native_window->GetJavaObject().obj(), 38 env, Java_ResourceManager_create(env, native_window->GetJavaObject(),
39 reinterpret_cast<intptr_t>(this)) 39 reinterpret_cast<intptr_t>(this))
40 .obj()); 40 .obj());
41 DCHECK(!java_obj_.is_null()); 41 DCHECK(!java_obj_.is_null());
42 } 42 }
43 43
44 ResourceManagerImpl::~ResourceManagerImpl() { 44 ResourceManagerImpl::~ResourceManagerImpl() {
45 Java_ResourceManager_destroy(base::android::AttachCurrentThread(), 45 Java_ResourceManager_destroy(base::android::AttachCurrentThread(), java_obj_);
46 java_obj_.obj());
47 } 46 }
48 47
49 void ResourceManagerImpl::Init(cc::LayerTreeHost* host) { 48 void ResourceManagerImpl::Init(cc::LayerTreeHost* host) {
50 DCHECK(!host_); 49 DCHECK(!host_);
51 DCHECK(host); 50 DCHECK(host);
52 host_ = host; 51 host_ = host;
53 } 52 }
54 53
55 base::android::ScopedJavaLocalRef<jobject> 54 base::android::ScopedJavaLocalRef<jobject>
56 ResourceManagerImpl::GetJavaObject() { 55 ResourceManagerImpl::GetJavaObject() {
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 bool ResourceManagerImpl::RegisterResourceManager(JNIEnv* env) { 222 bool ResourceManagerImpl::RegisterResourceManager(JNIEnv* env) {
224 return RegisterNativesImpl(env); 223 return RegisterNativesImpl(env);
225 } 224 }
226 225
227 void ResourceManagerImpl::PreloadResourceFromJava(AndroidResourceType res_type, 226 void ResourceManagerImpl::PreloadResourceFromJava(AndroidResourceType res_type,
228 int res_id) { 227 int res_id) {
229 TRACE_EVENT2("ui", "ResourceManagerImpl::PreloadResourceFromJava", 228 TRACE_EVENT2("ui", "ResourceManagerImpl::PreloadResourceFromJava",
230 "resource_type", res_type, 229 "resource_type", res_type,
231 "resource_id", res_id); 230 "resource_id", res_id);
232 Java_ResourceManager_preloadResource(base::android::AttachCurrentThread(), 231 Java_ResourceManager_preloadResource(base::android::AttachCurrentThread(),
233 java_obj_.obj(), res_type, res_id); 232 java_obj_, res_type, res_id);
234 } 233 }
235 234
236 void ResourceManagerImpl::RequestResourceFromJava(AndroidResourceType res_type, 235 void ResourceManagerImpl::RequestResourceFromJava(AndroidResourceType res_type,
237 int res_id) { 236 int res_id) {
238 TRACE_EVENT2("ui", "ResourceManagerImpl::RequestResourceFromJava", 237 TRACE_EVENT2("ui", "ResourceManagerImpl::RequestResourceFromJava",
239 "resource_type", res_type, 238 "resource_type", res_type,
240 "resource_id", res_id); 239 "resource_id", res_id);
241 Java_ResourceManager_resourceRequested(base::android::AttachCurrentThread(), 240 Java_ResourceManager_resourceRequested(base::android::AttachCurrentThread(),
242 java_obj_.obj(), res_type, res_id); 241 java_obj_, res_type, res_id);
243 } 242 }
244 243
245 void ResourceManagerImpl::RequestCrushedSpriteResourceFromJava( 244 void ResourceManagerImpl::RequestCrushedSpriteResourceFromJava(
246 int bitmap_res_id, int metadata_res_id, bool reloading) { 245 int bitmap_res_id, int metadata_res_id, bool reloading) {
247 TRACE_EVENT2("ui", 246 TRACE_EVENT2("ui",
248 "ResourceManagerImpl::RequestCrushedSpriteResourceFromJava", 247 "ResourceManagerImpl::RequestCrushedSpriteResourceFromJava",
249 "bitmap_res_id", bitmap_res_id, 248 "bitmap_res_id", bitmap_res_id,
250 "metadata_res_id", metadata_res_id); 249 "metadata_res_id", metadata_res_id);
251 Java_ResourceManager_crushedSpriteResourceRequested( 250 Java_ResourceManager_crushedSpriteResourceRequested(
252 base::android::AttachCurrentThread(), java_obj_.obj(), 251 base::android::AttachCurrentThread(), java_obj_, bitmap_res_id,
253 bitmap_res_id, metadata_res_id, reloading); 252 metadata_res_id, reloading);
254 } 253 }
255 254
256 } // namespace ui 255 } // namespace ui
OLDNEW
« no previous file with comments | « remoting/host/android/jni_host.cc ('k') | ui/android/view_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698