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

Unified Diff: cc/surfaces/direct_compositor_frame_sink.cc

Issue 2506883002: Revert of Remove SurfaceFactory::Create and SurfaceFactory::Destroy (Closed)
Patch Set: 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
« no previous file with comments | « blimp/client/core/compositor/blimp_compositor.cc ('k') | cc/surfaces/display_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/direct_compositor_frame_sink.cc
diff --git a/cc/surfaces/direct_compositor_frame_sink.cc b/cc/surfaces/direct_compositor_frame_sink.cc
index 8d568cd11c78befedd8532f9ad709b7c0d967ae0..aed324d5f0b2788d84dbf6b2bb8d57838a80b9a7 100644
--- a/cc/surfaces/direct_compositor_frame_sink.cc
+++ b/cc/surfaces/direct_compositor_frame_sink.cc
@@ -82,7 +82,8 @@
// Unregister the SurfaceFactoryClient here instead of the dtor so that only
// one client is alive for this namespace at any given time.
surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
- factory_.EvictSurface();
+ if (delegated_local_frame_id_.is_valid())
+ factory_.Destroy(delegated_local_frame_id_);
CompositorFrameSink::DetachFromClient();
}
@@ -90,7 +91,11 @@
void DirectCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) {
gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size();
if (frame_size.IsEmpty() || frame_size != last_swap_frame_size_) {
+ if (delegated_local_frame_id_.is_valid()) {
+ factory_.Destroy(delegated_local_frame_id_);
+ }
delegated_local_frame_id_ = surface_id_allocator_.GenerateId();
+ factory_.Create(delegated_local_frame_id_);
last_swap_frame_size_ = frame_size;
}
display_->SetLocalFrameId(delegated_local_frame_id_,
« no previous file with comments | « blimp/client/core/compositor/blimp_compositor.cc ('k') | cc/surfaces/display_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698