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

Unified Diff: components/view_manager/connection_manager.h

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/pdf_viewer/pdf_viewer.cc ('k') | components/view_manager/connection_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/view_manager/connection_manager.h
diff --git a/components/view_manager/connection_manager.h b/components/view_manager/connection_manager.h
index 9c176852c5611ff2304b1abcf1a355535fc733eb..82cd7aa18c60c08d645e0d0582701a9bf0331afe 100644
--- a/components/view_manager/connection_manager.h
+++ b/components/view_manager/connection_manager.h
@@ -19,6 +19,7 @@
#include "components/view_manager/public/interfaces/view_tree_host.mojom.h"
#include "components/view_manager/server_view_delegate.h"
#include "components/view_manager/server_view_observer.h"
+#include "components/view_manager/surfaces/surfaces_state.h"
#include "components/view_manager/view_tree_host_impl.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
@@ -71,7 +72,9 @@ class ConnectionManager : public ServerViewDelegate,
DISALLOW_COPY_AND_ASSIGN(ScopedChange);
};
- explicit ConnectionManager(ConnectionManagerDelegate* delegate);
+ ConnectionManager(
+ ConnectionManagerDelegate* delegate,
+ const scoped_refptr<surfaces::SurfacesState>& surfaces_state);
~ConnectionManager() override;
// Adds a ViewTreeHost.
@@ -223,6 +226,7 @@ class ConnectionManager : public ServerViewDelegate,
ViewTreeHostImpl* GetViewTreeHostByView(const ServerView* view) const;
// Overridden from ServerViewDelegate:
+ surfaces::SurfacesState* GetSurfacesState() override;
void PrepareToDestroyView(ServerView* view) override;
void PrepareToChangeViewHierarchy(ServerView* view,
ServerView* new_parent,
@@ -261,6 +265,9 @@ class ConnectionManager : public ServerViewDelegate,
ConnectionManagerDelegate* delegate_;
+ // State for rendering into a Surface.
+ scoped_refptr<surfaces::SurfacesState> surfaces_state_;
+
// ID to use for next ViewTreeImpl.
mojo::ConnectionSpecificId next_connection_id_;
« no previous file with comments | « components/pdf_viewer/pdf_viewer.cc ('k') | components/view_manager/connection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698