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

Unified Diff: components/mus/ws/server_window_surface.cc

Issue 1673783004: Hook up BeginFrameSource to SurfaceFactoryClient via SurfaceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Register id namespace on Android Created 4 years, 9 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/mus/ws/server_window_surface.h ('k') | components/mus/ws/server_window_surface_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/server_window_surface.cc
diff --git a/components/mus/ws/server_window_surface.cc b/components/mus/ws/server_window_surface.cc
index 9c836c9e478683f7aa0ce45219d02df9b59802d4..800de90e4a6c9edba67fe78d832261fc885d918d 100644
--- a/components/mus/ws/server_window_surface.cc
+++ b/components/mus/ws/server_window_surface.cc
@@ -32,13 +32,10 @@ ServerWindowSurface::ServerWindowSurface(
: manager_(manager),
surface_type_(surface_type),
surface_id_(manager->GenerateId()),
- surface_factory_(manager_->window()
- ->delegate()
- ->GetSurfacesState()
- ->manager(),
- this),
+ surface_factory_(manager_->GetSurfaceManager(), this),
client_(std::move(client)),
- binding_(this, std::move(request)) {
+ binding_(this, std::move(request)),
+ registered_surface_factory_client_(false) {
surface_factory_.Create(surface_id_);
}
@@ -47,6 +44,11 @@ ServerWindowSurface::~ServerWindowSurface() {
// call back into here and access |client_| so we should destroy
// |surface_factory_|'s resources early on.
surface_factory_.DestroyAll();
+
+ if (registered_surface_factory_client_) {
+ cc::SurfaceManager* surface_manager = manager_->GetSurfaceManager();
+ surface_manager->UnregisterSurfaceFactoryClient(manager_->id_namespace());
+ }
}
void ServerWindowSurface::SubmitCompositorFrame(
@@ -84,6 +86,13 @@ void ServerWindowSurface::DestroySurfacesScheduledForDestruction() {
surface_factory_.Destroy(id);
}
+void ServerWindowSurface::RegisterForBeginFrames() {
+ DCHECK(!registered_surface_factory_client_);
+ registered_surface_factory_client_ = true;
+ cc::SurfaceManager* surface_manager = manager_->GetSurfaceManager();
+ surface_manager->RegisterSurfaceFactoryClient(manager_->id_namespace(), this);
+}
+
ServerWindow* ServerWindowSurface::window() {
return manager_->window();
}
@@ -153,7 +162,6 @@ void ServerWindowSurface::ReturnResources(
}
void ServerWindowSurface::SetBeginFrameSource(
- cc::SurfaceId surface_id,
cc::BeginFrameSource* begin_frame_source) {
// TODO(tansell): Implement this.
}
« no previous file with comments | « components/mus/ws/server_window_surface.h ('k') | components/mus/ws/server_window_surface_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698