Index: components/view_manager/connection_manager.cc |
diff --git a/components/view_manager/connection_manager.cc b/components/view_manager/connection_manager.cc |
index d2fb1b01df8b95ee72149e725c82cc67587969a1..8c1bab46c7017761526853b4fa0cfedc1e222d9b 100644 |
--- a/components/view_manager/connection_manager.cc |
+++ b/components/view_manager/connection_manager.cc |
@@ -6,6 +6,7 @@ |
#include "base/logging.h" |
#include "base/stl_util.h" |
+#include "cc/output/compositor_frame.h" |
#include "components/view_manager/client_connection.h" |
#include "components/view_manager/connection_manager_delegate.h" |
#include "components/view_manager/focus_controller.h" |
@@ -110,8 +111,11 @@ ConnectionManager::ScopedChange::~ScopedChange() { |
connection_manager_->FinishChange(); |
} |
-ConnectionManager::ConnectionManager(ConnectionManagerDelegate* delegate) |
+ConnectionManager::ConnectionManager( |
+ ConnectionManagerDelegate* delegate, |
+ const scoped_refptr<surfaces::SurfacesState>& surfaces_state) |
: delegate_(delegate), |
+ surfaces_state_(surfaces_state), |
next_connection_id_(1), |
next_root_id_(0), |
event_dispatcher_(this), |
@@ -495,6 +499,10 @@ ViewManagerRootImpl* ConnectionManager::GetViewManagerRootByView( |
return nullptr; |
} |
+surfaces::SurfacesState* ConnectionManager::GetSurfacesState() { |
+ return surfaces_state_.get(); |
+} |
+ |
void ConnectionManager::PrepareToDestroyView(ServerView* view) { |
if (!in_destructor_ && IsViewAttachedToRoot(view) && |
view->id() != ClonedViewId()) { |