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

Unified Diff: services/ui/ws/server_window_compositor_frame_sink.cc

Issue 2485473003: Remove SurfaceFactory::Create and SurfaceFactory::Destroy (Closed)
Patch Set: up Created 4 years, 1 month 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: services/ui/ws/server_window_compositor_frame_sink.cc
diff --git a/services/ui/ws/server_window_compositor_frame_sink.cc b/services/ui/ws/server_window_compositor_frame_sink.cc
index 417cc36af41cf2ef3d7d430ff33193960e71385f..a555e4296c709126a5b293d0359738589d69c4f9 100644
--- a/services/ui/ws/server_window_compositor_frame_sink.cc
+++ b/services/ui/ws/server_window_compositor_frame_sink.cc
@@ -52,7 +52,6 @@ ServerWindowCompositorFrameSink::~ServerWindowCompositorFrameSink() {
// SurfaceFactory's destructor will attempt to return resources which will
// call back into here and access |client_| so we should destroy
// |surface_factory_|'s resources early on.
- surface_factory_.DestroyAll();
display_compositor_->manager()->UnregisterSurfaceFactoryClient(
frame_sink_id_);
display_compositor_->manager()->InvalidateFrameSinkId(frame_sink_id_);
@@ -70,10 +69,7 @@ void ServerWindowCompositorFrameSink::SubmitCompositorFrame(
// If the size of the CompostiorFrame has changed then destroy the existing
// Surface and create a new one of the appropriate size.
if (local_frame_id_.is_null() || frame_size != last_submitted_frame_size_) {
- if (!local_frame_id_.is_null())
- surface_factory_.Destroy(local_frame_id_);
local_frame_id_ = surface_id_allocator_.GenerateId();
- surface_factory_.Create(local_frame_id_);
if (display_)
display_->Resize(frame_size);
}

Powered by Google App Engine
This is Rietveld 408576698