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 bc8e7ed91e881ec80dee1ae1d8a6918a586e63d9..01239ee9f822df7c1f589bf8691e0857cf804881 100644 |
--- a/cc/surfaces/direct_compositor_frame_sink.cc |
+++ b/cc/surfaces/direct_compositor_frame_sink.cc |
@@ -82,8 +82,7 @@ void DirectCompositorFrameSink::DetachFromClient() { |
// 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_); |
- if (delegated_local_frame_id_.is_valid()) |
- factory_.Destroy(delegated_local_frame_id_); |
+ factory_.EvictSurface(); |
CompositorFrameSink::DetachFromClient(); |
} |
@@ -91,11 +90,7 @@ void DirectCompositorFrameSink::DetachFromClient() { |
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_, |
@@ -109,7 +104,7 @@ void DirectCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) { |
void DirectCompositorFrameSink::ForceReclaimResources() { |
if (delegated_local_frame_id_.is_valid()) |
- factory_.ClearSurface(delegated_local_frame_id_); |
+ factory_.ClearSurface(); |
} |
void DirectCompositorFrameSink::ReturnResources( |