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

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

Issue 2322943003: cc: Move UI Resource management out of LayerTreeHost. (Closed)
Patch Set: format Created 4 years, 3 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 #ifndef UI_ANDROID_RESOURCES_RESOURCE_MANAGER_IMPL_H_ 5 #ifndef UI_ANDROID_RESOURCES_RESOURCE_MANAGER_IMPL_H_
6 #define UI_ANDROID_RESOURCES_RESOURCE_MANAGER_IMPL_H_ 6 #define UI_ANDROID_RESOURCES_RESOURCE_MANAGER_IMPL_H_
7 7
8 #include "base/id_map.h" 8 #include "base/id_map.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/android/resources/resource_manager.h" 10 #include "ui/android/resources/resource_manager.h"
11 #include "ui/android/ui_android_export.h" 11 #include "ui/android/ui_android_export.h"
12 #include "ui/gfx/geometry/rect.h" 12 #include "ui/gfx/geometry/rect.h"
13 #include "ui/gfx/native_widget_types.h" 13 #include "ui/gfx/native_widget_types.h"
14 14
15 namespace cc {
16 class UIResourceManager;
17 } // namespace cc
18
15 namespace ui { 19 namespace ui {
16 20
17 class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager { 21 class UI_ANDROID_EXPORT ResourceManagerImpl : public ResourceManager {
18 public: 22 public:
19 static ResourceManagerImpl* FromJavaObject(jobject jobj); 23 static ResourceManagerImpl* FromJavaObject(jobject jobj);
20 24
21 explicit ResourceManagerImpl(gfx::NativeWindow native_window); 25 explicit ResourceManagerImpl(gfx::NativeWindow native_window);
22 ~ResourceManagerImpl() override; 26 ~ResourceManagerImpl() override;
23 27
24 void Init(cc::LayerTreeHost* host); 28 void Init(cc::UIResourceManager* ui_resource_manager);
25 29
26 // ResourceManager implementation. 30 // ResourceManager implementation.
27 base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override; 31 base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
28 Resource* GetResource(AndroidResourceType res_type, int res_id) override; 32 Resource* GetResource(AndroidResourceType res_type, int res_id) override;
29 void PreloadResource(AndroidResourceType res_type, int res_id) override; 33 void PreloadResource(AndroidResourceType res_type, int res_id) override;
30 CrushedSpriteResource* GetCrushedSpriteResource( 34 CrushedSpriteResource* GetCrushedSpriteResource(
31 int bitmap_res_id, int metadata_res_id) override; 35 int bitmap_res_id, int metadata_res_id) override;
32 36
33 // Called from Java 37 // Called from Java
34 // ---------------------------------------------------------- 38 // ----------------------------------------------------------
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 virtual void RequestResourceFromJava(AndroidResourceType res_type, 80 virtual void RequestResourceFromJava(AndroidResourceType res_type,
77 int res_id); 81 int res_id);
78 virtual void RequestCrushedSpriteResourceFromJava(int bitmap_res_id, 82 virtual void RequestCrushedSpriteResourceFromJava(int bitmap_res_id,
79 int metadata_res_id, 83 int metadata_res_id,
80 bool reloading); 84 bool reloading);
81 85
82 typedef IDMap<Resource, IDMapOwnPointer> ResourceMap; 86 typedef IDMap<Resource, IDMapOwnPointer> ResourceMap;
83 typedef IDMap<CrushedSpriteResource, IDMapOwnPointer> 87 typedef IDMap<CrushedSpriteResource, IDMapOwnPointer>
84 CrushedSpriteResourceMap; 88 CrushedSpriteResourceMap;
85 89
86 cc::LayerTreeHost* host_; 90 cc::UIResourceManager* ui_resource_manager_;
87 ResourceMap resources_[ANDROID_RESOURCE_TYPE_COUNT]; 91 ResourceMap resources_[ANDROID_RESOURCE_TYPE_COUNT];
88 CrushedSpriteResourceMap crushed_sprite_resources_; 92 CrushedSpriteResourceMap crushed_sprite_resources_;
89 93
90 base::android::ScopedJavaGlobalRef<jobject> java_obj_; 94 base::android::ScopedJavaGlobalRef<jobject> java_obj_;
91 95
92 DISALLOW_COPY_AND_ASSIGN(ResourceManagerImpl); 96 DISALLOW_COPY_AND_ASSIGN(ResourceManagerImpl);
93 }; 97 };
94 98
95 } // namespace ui 99 } // namespace ui
96 100
97 #endif // UI_ANDROID_RESOURCES_RESOURCE_MANAGER_IMPL_H_ 101 #endif // UI_ANDROID_RESOURCES_RESOURCE_MANAGER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698