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

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 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
« no previous file with comments | « components/view_manager/connection_manager.h ('k') | components/view_manager/public/cpp/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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()) {
« no previous file with comments | « components/view_manager/connection_manager.h ('k') | components/view_manager/public/cpp/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698