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

Side by Side Diff: content/browser/renderer_host/compositor_impl_android.h

Issue 2565783002: Moves ownership of the cc::Display's BeginFrameSource out of Display. (Closed)
Patch Set: rebase. Created 4 years 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 15 matching lines...) Expand all
26 #include "third_party/khronos/GLES2/gl2.h" 26 #include "third_party/khronos/GLES2/gl2.h"
27 #include "ui/android/context_provider_factory.h" 27 #include "ui/android/context_provider_factory.h"
28 #include "ui/android/resources/resource_manager_impl.h" 28 #include "ui/android/resources/resource_manager_impl.h"
29 #include "ui/android/resources/ui_resource_provider.h" 29 #include "ui/android/resources/ui_resource_provider.h"
30 #include "ui/android/window_android_compositor.h" 30 #include "ui/android/window_android_compositor.h"
31 31
32 struct ANativeWindow; 32 struct ANativeWindow;
33 33
34 namespace cc { 34 namespace cc {
35 class AnimationHost; 35 class AnimationHost;
36 class BeginFrameSource;
36 class Display; 37 class Display;
37 class Layer; 38 class Layer;
38 class LayerTreeHost; 39 class LayerTreeHost;
39 class OutputSurface; 40 class OutputSurface;
40 class VulkanContextProvider; 41 class VulkanContextProvider;
41 } 42 }
42 43
43 namespace content { 44 namespace content {
44 class CompositorClient; 45 class CompositorClient;
45 46
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 145
145 // Subtree for hidden layers with CopyOutputRequests on them. 146 // Subtree for hidden layers with CopyOutputRequests on them.
146 scoped_refptr<cc::Layer> readback_layer_tree_; 147 scoped_refptr<cc::Layer> readback_layer_tree_;
147 148
148 // Destruction order matters here: 149 // Destruction order matters here:
149 base::ObserverList<VSyncObserver, true> observer_list_; 150 base::ObserverList<VSyncObserver, true> observer_list_;
150 std::unique_ptr<cc::AnimationHost> animation_host_; 151 std::unique_ptr<cc::AnimationHost> animation_host_;
151 std::unique_ptr<cc::LayerTreeHost> host_; 152 std::unique_ptr<cc::LayerTreeHost> host_;
152 ui::ResourceManagerImpl resource_manager_; 153 ui::ResourceManagerImpl resource_manager_;
153 154
155 std::unique_ptr<cc::BeginFrameSource> begin_frame_source_;
154 std::unique_ptr<cc::Display> display_; 156 std::unique_ptr<cc::Display> display_;
155 157
156 gfx::Size size_; 158 gfx::Size size_;
157 bool has_transparent_background_; 159 bool has_transparent_background_;
158 float device_scale_factor_; 160 float device_scale_factor_;
159 161
160 ANativeWindow* window_; 162 ANativeWindow* window_;
161 gpu::SurfaceHandle surface_handle_; 163 gpu::SurfaceHandle surface_handle_;
162 164
163 CompositorClient* client_; 165 CompositorClient* client_;
(...skipping 18 matching lines...) Expand all
182 gpu::Capabilities gpu_capabilities_; 184 gpu::Capabilities gpu_capabilities_;
183 bool needs_begin_frames_; 185 bool needs_begin_frames_;
184 base::WeakPtrFactory<CompositorImpl> weak_factory_; 186 base::WeakPtrFactory<CompositorImpl> weak_factory_;
185 187
186 DISALLOW_COPY_AND_ASSIGN(CompositorImpl); 188 DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
187 }; 189 };
188 190
189 } // namespace content 191 } // namespace content
190 192
191 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 193 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
OLDNEW
« no previous file with comments | « content/browser/compositor/gpu_process_transport_factory.cc ('k') | content/browser/renderer_host/compositor_impl_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698