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

Side by Side Diff: blimp/client/support/compositor/blimp_embedder_compositor.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 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_SUPPORT_COMPOSITOR_BLIMP_EMBEDDER_COMPOSITOR_H_ 5 #ifndef BLIMP_CLIENT_SUPPORT_COMPOSITOR_BLIMP_EMBEDDER_COMPOSITOR_H_
6 #define BLIMP_CLIENT_SUPPORT_COMPOSITOR_BLIMP_EMBEDDER_COMPOSITOR_H_ 6 #define BLIMP_CLIENT_SUPPORT_COMPOSITOR_BLIMP_EMBEDDER_COMPOSITOR_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "cc/layers/layer.h" 11 #include "cc/layers/layer.h"
12 #include "cc/surfaces/frame_sink_id.h" 12 #include "cc/surfaces/frame_sink_id.h"
13 #include "cc/trees/layer_tree_host_client.h" 13 #include "cc/trees/layer_tree_host_client.h"
14 #include "cc/trees/layer_tree_host_single_thread_client.h" 14 #include "cc/trees/layer_tree_host_single_thread_client.h"
15 #include "ui/gfx/geometry/size.h" 15 #include "ui/gfx/geometry/size.h"
16 16
17 namespace cc { 17 namespace cc {
18 class AnimationHost; 18 class AnimationHost;
19 class BeginFrameSource;
19 class ContextProvider; 20 class ContextProvider;
20 class Display; 21 class Display;
21 class LayerTreeHost; 22 class LayerTreeHost;
22 } // namespace cc 23 } // namespace cc
23 24
24 namespace blimp { 25 namespace blimp {
25 namespace client { 26 namespace client {
26 class CompositorDependencies; 27 class CompositorDependencies;
27 28
28 // The parent compositor that embeds the content from the BlimpCompositor for 29 // The parent compositor that embeds the content from the BlimpCompositor for
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 private: 76 private:
76 void HandlePendingCompositorFrameSinkRequest(); 77 void HandlePendingCompositorFrameSinkRequest();
77 78
78 CompositorDependencies* compositor_dependencies_; 79 CompositorDependencies* compositor_dependencies_;
79 80
80 cc::FrameSinkId frame_sink_id_; 81 cc::FrameSinkId frame_sink_id_;
81 82
82 scoped_refptr<cc::ContextProvider> context_provider_; 83 scoped_refptr<cc::ContextProvider> context_provider_;
83 84
84 bool compositor_frame_sink_request_pending_; 85 bool compositor_frame_sink_request_pending_;
86 std::unique_ptr<cc::BeginFrameSource> begin_frame_source_;
85 std::unique_ptr<cc::Display> display_; 87 std::unique_ptr<cc::Display> display_;
86 88
87 gfx::Size viewport_size_in_px_; 89 gfx::Size viewport_size_in_px_;
88 90
89 std::unique_ptr<cc::AnimationHost> animation_host_; 91 std::unique_ptr<cc::AnimationHost> animation_host_;
90 std::unique_ptr<cc::LayerTreeHost> host_; 92 std::unique_ptr<cc::LayerTreeHost> host_;
91 scoped_refptr<cc::Layer> root_layer_; 93 scoped_refptr<cc::Layer> root_layer_;
92 94
93 base::Closure did_complete_swap_buffers_; 95 base::Closure did_complete_swap_buffers_;
94 96
95 DISALLOW_COPY_AND_ASSIGN(BlimpEmbedderCompositor); 97 DISALLOW_COPY_AND_ASSIGN(BlimpEmbedderCompositor);
96 }; 98 };
97 99
98 } // namespace client 100 } // namespace client
99 } // namespace blimp 101 } // namespace blimp
100 102
101 #endif // BLIMP_CLIENT_SUPPORT_COMPOSITOR_BLIMP_EMBEDDER_COMPOSITOR_H_ 103 #endif // BLIMP_CLIENT_SUPPORT_COMPOSITOR_BLIMP_EMBEDDER_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « android_webview/browser/surfaces_instance.cc ('k') | blimp/client/support/compositor/blimp_embedder_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698