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

Side by Side Diff: services/ui/surfaces/display_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 SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ 5 #ifndef SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
6 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ 6 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
7 7
8 #include "cc/scheduler/begin_frame_source.h"
9 #include "cc/surfaces/display_client.h" 8 #include "cc/surfaces/display_client.h"
10 #include "cc/surfaces/surface.h" 9 #include "cc/surfaces/surface.h"
11 #include "cc/surfaces/surface_factory.h" 10 #include "cc/surfaces/surface_factory.h"
12 #include "cc/surfaces/surface_factory_client.h" 11 #include "cc/surfaces/surface_factory_client.h"
13 #include "cc/surfaces/surface_id_allocator.h" 12 #include "cc/surfaces/surface_id_allocator.h"
14 #include "services/ui/surfaces/surfaces_state.h" 13 #include "services/ui/surfaces/surfaces_state.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;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 void DisplayDidDrawAndSwap() override; 70 void DisplayDidDrawAndSwap() override;
72 71
73 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 72 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
74 scoped_refptr<SurfacesState> surfaces_state_; 73 scoped_refptr<SurfacesState> surfaces_state_;
75 cc::SurfaceFactory factory_; 74 cc::SurfaceFactory factory_;
76 cc::SurfaceIdAllocator allocator_; 75 cc::SurfaceIdAllocator allocator_;
77 cc::SurfaceId surface_id_; 76 cc::SurfaceId surface_id_;
78 77
79 gfx::Size display_size_; 78 gfx::Size display_size_;
80 std::unique_ptr<cc::Display> display_; 79 std::unique_ptr<cc::Display> display_;
81 std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source_;
82 DISALLOW_COPY_AND_ASSIGN(DisplayCompositor); 80 DISALLOW_COPY_AND_ASSIGN(DisplayCompositor);
83 }; 81 };
84 82
85 } // namespace ui 83 } // namespace ui
86 84
87 #endif // SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ 85 #endif // SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/compositor_impl_android.cc ('k') | services/ui/surfaces/display_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698