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

Side by Side Diff: blimp/client/app/compositor/browser_compositor.h

Issue 2304483002: Revert of Make cc::Display not own its BeginFrameSource (Closed)
Patch Set: 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 BLIMP_CLIENT_APP_COMPOSITOR_BROWSER_COMPOSITOR_H_ 5 #ifndef BLIMP_CLIENT_APP_COMPOSITOR_BROWSER_COMPOSITOR_H_
6 #define BLIMP_CLIENT_APP_COMPOSITOR_BROWSER_COMPOSITOR_H_ 6 #define BLIMP_CLIENT_APP_COMPOSITOR_BROWSER_COMPOSITOR_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "cc/scheduler/begin_frame_source.h"
12 #include "cc/trees/layer_tree_host_client.h" 11 #include "cc/trees/layer_tree_host_client.h"
13 #include "cc/trees/layer_tree_host_single_thread_client.h" 12 #include "cc/trees/layer_tree_host_single_thread_client.h"
14 #include "ui/gfx/geometry/size.h" 13 #include "ui/gfx/geometry/size.h"
15 #include "ui/gfx/native_widget_types.h" 14 #include "ui/gfx/native_widget_types.h"
16 15
17 namespace cc { 16 namespace cc {
18 class Display; 17 class Display;
19 class Layer; 18 class Layer;
20 class LayerTreeHost; 19 class LayerTreeHost;
21 class SurfaceIdAllocator; 20 class SurfaceIdAllocator;
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 void DidAbortSwapBuffers() override {} 76 void DidAbortSwapBuffers() override {}
78 77
79 void HandlePendingOutputSurfaceRequest(); 78 void HandlePendingOutputSurfaceRequest();
80 79
81 CompositorDependencies* compositor_dependencies_; 80 CompositorDependencies* compositor_dependencies_;
82 81
83 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; 82 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
84 gfx::AcceleratedWidget widget_; 83 gfx::AcceleratedWidget widget_;
85 bool output_surface_request_pending_; 84 bool output_surface_request_pending_;
86 std::unique_ptr<cc::Display> display_; 85 std::unique_ptr<cc::Display> display_;
87 std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source_;
88 86
89 gfx::Size viewport_size_in_px_; 87 gfx::Size viewport_size_in_px_;
90 88
91 std::unique_ptr<cc::LayerTreeHost> host_; 89 std::unique_ptr<cc::LayerTreeHost> host_;
92 scoped_refptr<cc::Layer> root_layer_; 90 scoped_refptr<cc::Layer> root_layer_;
93 91
94 base::Closure did_complete_swap_buffers_; 92 base::Closure did_complete_swap_buffers_;
95 93
96 DISALLOW_COPY_AND_ASSIGN(BrowserCompositor); 94 DISALLOW_COPY_AND_ASSIGN(BrowserCompositor);
97 }; 95 };
98 96
99 } // namespace client 97 } // namespace client
100 } // namespace blimp 98 } // namespace blimp
101 99
102 #endif // BLIMP_CLIENT_APP_COMPOSITOR_BROWSER_COMPOSITOR_H_ 100 #endif // BLIMP_CLIENT_APP_COMPOSITOR_BROWSER_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « android_webview/browser/surfaces_instance.cc ('k') | blimp/client/app/compositor/browser_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698