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

Side by Side Diff: android_webview/browser/surfaces_instance.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
« no previous file with comments | « no previous file | android_webview/browser/surfaces_instance.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_ 5 #ifndef ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_
6 #define ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_ 6 #define ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 void ReturnResources(const cc::ReturnedResourceArray& resources) override; 66 void ReturnResources(const cc::ReturnedResourceArray& resources) override;
67 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override; 67 void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override;
68 68
69 void SetEmptyRootFrame(); 69 void SetEmptyRootFrame();
70 70
71 uint32_t next_client_id_; 71 uint32_t next_client_id_;
72 72
73 cc::FrameSinkId frame_sink_id_; 73 cc::FrameSinkId frame_sink_id_;
74 74
75 std::unique_ptr<cc::SurfaceManager> surface_manager_; 75 std::unique_ptr<cc::SurfaceManager> surface_manager_;
76 std::unique_ptr<cc::BeginFrameSource> begin_frame_source_;
76 std::unique_ptr<cc::Display> display_; 77 std::unique_ptr<cc::Display> display_;
77 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; 78 std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
78 std::unique_ptr<cc::SurfaceFactory> surface_factory_; 79 std::unique_ptr<cc::SurfaceFactory> surface_factory_;
79 80
80 cc::LocalFrameId root_id_; 81 cc::LocalFrameId root_id_;
81 std::vector<cc::SurfaceId> child_ids_; 82 std::vector<cc::SurfaceId> child_ids_;
82 83
83 // This is owned by |display_|. 84 // This is owned by |display_|.
84 ParentOutputSurface* output_surface_; 85 ParentOutputSurface* output_surface_;
85 86
86 DISALLOW_COPY_AND_ASSIGN(SurfacesInstance); 87 DISALLOW_COPY_AND_ASSIGN(SurfacesInstance);
87 }; 88 };
88 89
89 } // namespace android_webview 90 } // namespace android_webview
90 91
91 #endif // ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_ 92 #endif // ANDROID_WEBVIEW_BROWSER_SURFACES_INSTANCE_H_
OLDNEW
« no previous file with comments | « no previous file | android_webview/browser/surfaces_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698