| Index: components/view_manager/connection_manager.cc
|
| diff --git a/components/view_manager/connection_manager.cc b/components/view_manager/connection_manager.cc
|
| index 911606fd198c6590d7151997c8000617a1dbd0e5..a73e4059a371ac05b5a064eb8cb4add53b6a2b01 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_host_id_(0),
|
| event_dispatcher_(this),
|
| @@ -494,6 +498,10 @@ ViewTreeHostImpl* ConnectionManager::GetViewTreeHostByView(
|
| return nullptr;
|
| }
|
|
|
| +surfaces::SurfacesState* ConnectionManager::GetSurfacesState() {
|
| + return surfaces_state_.get();
|
| +}
|
| +
|
| void ConnectionManager::PrepareToDestroyView(ServerView* view) {
|
| if (!in_destructor_ && IsViewAttachedToRoot(view) &&
|
| view->id() != ClonedViewId()) {
|
|
|