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

Side by Side Diff: content/browser/renderer_host/compositor_impl_android.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 16 matching lines...) Expand all
27 #include "ui/android/resources/resource_manager_impl.h" 27 #include "ui/android/resources/resource_manager_impl.h"
28 #include "ui/android/resources/ui_resource_provider.h" 28 #include "ui/android/resources/ui_resource_provider.h"
29 #include "ui/android/window_android_compositor.h" 29 #include "ui/android/window_android_compositor.h"
30 30
31 class SkBitmap; 31 class SkBitmap;
32 struct ANativeWindow; 32 struct ANativeWindow;
33 33
34 namespace cc { 34 namespace cc {
35 class Display; 35 class Display;
36 class Layer; 36 class Layer;
37 class LayerTreeHost; 37 class LayerTreeHostInterface;
38 class SurfaceIdAllocator; 38 class SurfaceIdAllocator;
39 class SurfaceManager; 39 class SurfaceManager;
40 class VulkanContextProvider; 40 class VulkanContextProvider;
41 class VulkanInProcessContextProvider; 41 class VulkanInProcessContextProvider;
42 } 42 }
43 43
44 namespace content { 44 namespace content {
45 class CompositorClient; 45 class CompositorClient;
46 46
47 // ----------------------------------------------------------------------------- 47 // -----------------------------------------------------------------------------
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 // root_layer_ is the persistent internal root layer, while subroot_layer_ 139 // root_layer_ is the persistent internal root layer, while subroot_layer_
140 // is the one attached by the compositor client. 140 // is the one attached by the compositor client.
141 scoped_refptr<cc::Layer> subroot_layer_; 141 scoped_refptr<cc::Layer> subroot_layer_;
142 142
143 // Subtree for hidden layers with CopyOutputRequests on them. 143 // Subtree for hidden layers with CopyOutputRequests on them.
144 scoped_refptr<cc::Layer> readback_layer_tree_; 144 scoped_refptr<cc::Layer> readback_layer_tree_;
145 145
146 // Destruction order matters here: 146 // Destruction order matters here:
147 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; 147 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
148 base::ObserverList<VSyncObserver, true> observer_list_; 148 base::ObserverList<VSyncObserver, true> observer_list_;
149 std::unique_ptr<cc::LayerTreeHost> host_; 149 std::unique_ptr<cc::LayerTreeHostInterface> host_;
150 ui::ResourceManagerImpl resource_manager_; 150 ui::ResourceManagerImpl resource_manager_;
151 151
152 std::unique_ptr<cc::Display> display_; 152 std::unique_ptr<cc::Display> display_;
153 153
154 gfx::Size size_; 154 gfx::Size size_;
155 bool has_transparent_background_; 155 bool has_transparent_background_;
156 float device_scale_factor_; 156 float device_scale_factor_;
157 157
158 ANativeWindow* window_; 158 ANativeWindow* window_;
159 gpu::SurfaceHandle surface_handle_; 159 gpu::SurfaceHandle surface_handle_;
(...skipping 20 matching lines...) Expand all
180 gpu::Capabilities gpu_capabilities_; 180 gpu::Capabilities gpu_capabilities_;
181 bool needs_begin_frames_; 181 bool needs_begin_frames_;
182 base::WeakPtrFactory<CompositorImpl> weak_factory_; 182 base::WeakPtrFactory<CompositorImpl> weak_factory_;
183 183
184 DISALLOW_COPY_AND_ASSIGN(CompositorImpl); 184 DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
185 }; 185 };
186 186
187 } // namespace content 187 } // namespace content
188 188
189 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 189 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698