| Index: cc/surfaces/surface_manager.h
|
| diff --git a/cc/surfaces/surface_manager.h b/cc/surfaces/surface_manager.h
|
| index f7d68cf425a89590a65b1b16b697319db7729278..f0e9630b3a6d9fd787aca4175d165677f8769ea3 100644
|
| --- a/cc/surfaces/surface_manager.h
|
| +++ b/cc/surfaces/surface_manager.h
|
| @@ -19,6 +19,7 @@
|
| #include "base/observer_list.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "cc/surfaces/frame_sink_id.h"
|
| +#include "cc/surfaces/surface_dependency_tracker.h"
|
| #include "cc/surfaces/surface_id.h"
|
| #include "cc/surfaces/surface_observer.h"
|
| #include "cc/surfaces/surface_reference.h"
|
| @@ -52,6 +53,14 @@ class CC_SURFACES_EXPORT SurfaceManager {
|
| std::string SurfaceReferencesToString();
|
| #endif
|
|
|
| + void SetDependencyTracker(
|
| + std::unique_ptr<SurfaceDependencyTracker> dependency_tracker);
|
| + SurfaceDependencyTracker* dependency_tracker() {
|
| + return dependency_tracker_.get();
|
| + }
|
| +
|
| + void RequestSurfaceResolution(Surface* pending_surface);
|
| +
|
| void RegisterSurface(Surface* surface);
|
| void DeregisterSurface(const SurfaceId& surface_id);
|
|
|
| @@ -261,6 +270,8 @@ class CC_SURFACES_EXPORT SurfaceManager {
|
| std::unordered_map<FrameSinkId, std::vector<LocalSurfaceId>, FrameSinkIdHash>
|
| temp_references_;
|
|
|
| + std::unique_ptr<SurfaceDependencyTracker> dependency_tracker_;
|
| +
|
| base::WeakPtrFactory<SurfaceManager> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SurfaceManager);
|
|
|