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

Side by Side Diff: ui/android/resources/resource_manager_impl.cc

Issue 1578353002: Pull the Activity context from WindowAndroid if possible (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@2564
Patch Set: Created 4 years, 11 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 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 <utility> 7 #include <utility>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
11 #include "base/android/jni_string.h" 11 #include "base/android/jni_string.h"
12 #include "base/trace_event/trace_event.h" 12 #include "base/trace_event/trace_event.h"
13 #include "cc/resources/scoped_ui_resource.h" 13 #include "cc/resources/scoped_ui_resource.h"
14 #include "jni/ResourceManager_jni.h" 14 #include "jni/ResourceManager_jni.h"
15 #include "ui/android/resources/ui_resource_provider.h" 15 #include "ui/android/resources/ui_resource_provider.h"
16 #include "ui/android/window_android.h"
16 #include "ui/gfx/android/java_bitmap.h" 17 #include "ui/gfx/android/java_bitmap.h"
17 #include "ui/gfx/geometry/rect.h" 18 #include "ui/gfx/geometry/rect.h"
18 19
19 using base::android::JavaArrayOfIntArrayToIntVector; 20 using base::android::JavaArrayOfIntArrayToIntVector;
20 21
21 namespace ui { 22 namespace ui {
22 23
23 // static 24 // static
24 ResourceManagerImpl* ResourceManagerImpl::FromJavaObject(jobject jobj) { 25 ResourceManagerImpl* ResourceManagerImpl::FromJavaObject(jobject jobj) {
25 return reinterpret_cast<ResourceManagerImpl*>( 26 return reinterpret_cast<ResourceManagerImpl*>(
26 Java_ResourceManager_getNativePtr(base::android::AttachCurrentThread(), 27 Java_ResourceManager_getNativePtr(base::android::AttachCurrentThread(),
27 jobj)); 28 jobj));
28 } 29 }
29 30
30 ResourceManagerImpl::ResourceManagerImpl() : host_(nullptr) { 31 ResourceManagerImpl::ResourceManagerImpl(gfx::NativeWindow native_window)
32 : host_(nullptr) {
31 JNIEnv* env = base::android::AttachCurrentThread(); 33 JNIEnv* env = base::android::AttachCurrentThread();
32 java_obj_.Reset(env, Java_ResourceManager_create( 34 java_obj_.Reset(env, Java_ResourceManager_create(
33 env, base::android::GetApplicationContext(), 35 env, native_window->GetJavaObject().obj(),
34 reinterpret_cast<intptr_t>(this)).obj()); 36 reinterpret_cast<intptr_t>(this))
37 .obj());
35 DCHECK(!java_obj_.is_null()); 38 DCHECK(!java_obj_.is_null());
36 } 39 }
37 40
38 ResourceManagerImpl::~ResourceManagerImpl() { 41 ResourceManagerImpl::~ResourceManagerImpl() {
39 Java_ResourceManager_destroy(base::android::AttachCurrentThread(), 42 Java_ResourceManager_destroy(base::android::AttachCurrentThread(),
40 java_obj_.obj()); 43 java_obj_.obj());
41 } 44 }
42 45
43 void ResourceManagerImpl::Init(cc::LayerTreeHost* host) { 46 void ResourceManagerImpl::Init(cc::LayerTreeHost* host) {
44 DCHECK(!host_); 47 DCHECK(!host_);
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 TRACE_EVENT2("ui", 244 TRACE_EVENT2("ui",
242 "ResourceManagerImpl::RequestCrushedSpriteResourceFromJava", 245 "ResourceManagerImpl::RequestCrushedSpriteResourceFromJava",
243 "bitmap_res_id", bitmap_res_id, 246 "bitmap_res_id", bitmap_res_id,
244 "metadata_res_id", metadata_res_id); 247 "metadata_res_id", metadata_res_id);
245 Java_ResourceManager_crushedSpriteResourceRequested( 248 Java_ResourceManager_crushedSpriteResourceRequested(
246 base::android::AttachCurrentThread(), java_obj_.obj(), 249 base::android::AttachCurrentThread(), java_obj_.obj(),
247 bitmap_res_id, metadata_res_id, reloading); 250 bitmap_res_id, metadata_res_id, reloading);
248 } 251 }
249 252
250 } // namespace ui 253 } // namespace ui
OLDNEW
« no previous file with comments | « ui/android/resources/resource_manager_impl.h ('k') | ui/android/resources/resource_manager_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698