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

Unified Diff: components/view_manager/connection_manager.cc

Issue 1281663002: Mandoline: Allow submitting CompositorFrames directly to mojo::Views (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased + added uip::Surface Created 5 years, 4 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
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()) {

Powered by Google App Engine
This is Rietveld 408576698