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 da704c512f90dd9e4e05ba8632b3143d95abbbfe..f214463c5e3e8e97bc6d8763b02bb0cbc17f926a 100644 |
--- a/cc/surfaces/direct_compositor_frame_sink.cc |
+++ b/cc/surfaces/direct_compositor_frame_sink.cc |
@@ -99,17 +99,15 @@ |
frame.metadata.begin_frame_ack.sequence_number); |
gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size(); |
- if (!local_surface_id_.is_valid() || frame_size != last_swap_frame_size_ || |
- frame.metadata.device_scale_factor != device_scale_factor_) { |
- local_surface_id_ = local_surface_id_allocator_.GenerateId(); |
+ if (frame_size.IsEmpty() || frame_size != last_swap_frame_size_) { |
+ delegated_local_surface_id_ = local_surface_id_allocator_.GenerateId(); |
last_swap_frame_size_ = frame_size; |
- device_scale_factor_ = frame.metadata.device_scale_factor; |
- display_->SetLocalSurfaceId(local_surface_id_, device_scale_factor_); |
} |
+ display_->SetLocalSurfaceId(delegated_local_surface_id_, |
+ frame.metadata.device_scale_factor); |
- bool result = |
- support_->SubmitCompositorFrame(local_surface_id_, std::move(frame)); |
- DCHECK(result); |
+ support_->SubmitCompositorFrame(delegated_local_surface_id_, |
+ std::move(frame)); |
} |
void DirectCompositorFrameSink::DidNotProduceFrame(const BeginFrameAck& ack) { |