OLD | NEW |
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 "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
8 #include "base/trace_event/trace_event.h" | 8 #include "base/trace_event/trace_event.h" |
9 #include "jni/ResourceManager_jni.h" | 9 #include "jni/ResourceManager_jni.h" |
10 #include "ui/android/resources/ui_resource_android.h" | 10 #include "ui/android/resources/ui_resource_android.h" |
11 #include "ui/android/resources/ui_resource_provider.h" | 11 #include "ui/android/resources/ui_resource_provider.h" |
12 #include "ui/gfx/android/java_bitmap.h" | 12 #include "ui/gfx/android/java_bitmap.h" |
13 | 13 |
14 namespace ui { | 14 namespace ui { |
15 | 15 |
16 // static | 16 // static |
17 ResourceManagerImpl* ResourceManagerImpl::FromJavaObject(jobject jobj) { | 17 ResourceManagerImpl* ResourceManagerImpl::FromJavaObject(jobject jobj) { |
18 return reinterpret_cast<ResourceManagerImpl*>( | 18 return reinterpret_cast<ResourceManagerImpl*>( |
19 Java_ResourceManager_getNativePtr(base::android::AttachCurrentThread(), | 19 Java_ResourceManager_getNativePtr(base::android::AttachCurrentThread(), |
20 jobj)); | 20 jobj)); |
21 } | 21 } |
22 | 22 |
23 ResourceManagerImpl::ResourceManagerImpl( | 23 ResourceManagerImpl::ResourceManagerImpl( |
24 ui::UIResourceProvider* ui_resource_provider) | 24 ui::UIResourceProvider* ui_resource_provider, |
| 25 jobject context) |
25 : ui_resource_provider_(ui_resource_provider) { | 26 : ui_resource_provider_(ui_resource_provider) { |
26 JNIEnv* env = base::android::AttachCurrentThread(); | 27 JNIEnv* env = base::android::AttachCurrentThread(); |
27 java_obj_.Reset(env, Java_ResourceManager_create( | 28 java_obj_.Reset( |
28 env, base::android::GetApplicationContext(), | 29 env, Java_ResourceManager_create(env, context, |
29 reinterpret_cast<intptr_t>(this)).obj()); | 30 reinterpret_cast<intptr_t>(this)).obj()); |
30 DCHECK(!java_obj_.is_null()); | 31 DCHECK(!java_obj_.is_null()); |
31 } | 32 } |
32 | 33 |
33 ResourceManagerImpl::~ResourceManagerImpl() { | 34 ResourceManagerImpl::~ResourceManagerImpl() { |
34 Java_ResourceManager_destroy(base::android::AttachCurrentThread(), | 35 Java_ResourceManager_destroy(base::android::AttachCurrentThread(), |
35 java_obj_.obj()); | 36 java_obj_.obj()); |
36 } | 37 } |
37 | 38 |
38 base::android::ScopedJavaLocalRef<jobject> | 39 base::android::ScopedJavaLocalRef<jobject> |
39 ResourceManagerImpl::GetJavaObject() { | 40 ResourceManagerImpl::GetJavaObject() { |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 void ResourceManagerImpl::RequestResourceFromJava(AndroidResourceType res_type, | 124 void ResourceManagerImpl::RequestResourceFromJava(AndroidResourceType res_type, |
124 int res_id) { | 125 int res_id) { |
125 TRACE_EVENT2("ui", "ResourceManagerImpl::RequestResourceFromJava", | 126 TRACE_EVENT2("ui", "ResourceManagerImpl::RequestResourceFromJava", |
126 "resource_type", res_type, | 127 "resource_type", res_type, |
127 "resource_id", res_id); | 128 "resource_id", res_id); |
128 Java_ResourceManager_resourceRequested(base::android::AttachCurrentThread(), | 129 Java_ResourceManager_resourceRequested(base::android::AttachCurrentThread(), |
129 java_obj_.obj(), res_type, res_id); | 130 java_obj_.obj(), res_type, res_id); |
130 } | 131 } |
131 | 132 |
132 } // namespace ui | 133 } // namespace ui |
OLD | NEW |