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

Unified Diff: cc/surfaces/surface_manager.cc

Issue 2880023002: cc::SurfaceDependencyTracker should not crash when a Display goes away (Closed)
Patch Set: Fix LayerTreeHostImpl unit tests Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/surfaces/surface_manager.h ('k') | cc/surfaces/surface_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_manager.cc
diff --git a/cc/surfaces/surface_manager.cc b/cc/surfaces/surface_manager.cc
index 9875d04d29debce79e941266f16c4eff507e1ed6..07d2338009404168851632729f0830b1ec739e79 100644
--- a/cc/surfaces/surface_manager.cc
+++ b/cc/surfaces/surface_manager.cc
@@ -65,8 +65,8 @@ std::string SurfaceManager::SurfaceReferencesToString() {
#endif
void SurfaceManager::SetDependencyTracker(
- std::unique_ptr<SurfaceDependencyTracker> dependency_tracker) {
- dependency_tracker_ = std::move(dependency_tracker);
+ SurfaceDependencyTracker* dependency_tracker) {
+ dependency_tracker_ = dependency_tracker;
}
void SurfaceManager::RequestSurfaceResolution(Surface* pending_surface) {
@@ -431,6 +431,10 @@ void SurfaceManager::UnregisterBeginFrameSource(BeginFrameSource* source) {
framesink_manager_.UnregisterBeginFrameSource(source);
}
+BeginFrameSource* SurfaceManager::GetPrimaryBeginFrameSource() {
+ return framesink_manager_.GetPrimaryBeginFrameSource();
+}
+
void SurfaceManager::RegisterFrameSinkHierarchy(
const FrameSinkId& parent_frame_sink_id,
const FrameSinkId& child_frame_sink_id) {
« no previous file with comments | « cc/surfaces/surface_manager.h ('k') | cc/surfaces/surface_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698