Display Compositor: Allocate LocalFrameId in client.

services/ui/ws/gpu_compositor_frame_sink.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/ws/gpu_compositor_frame_sink.h"
 
 #include "base/callback.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 47 matching lines @@
   display_compositor_->manager()->UnregisterSurfaceFactoryClient(
       frame_sink_id_);
   display_compositor_->manager()->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 void GpuCompositorFrameSink::SetNeedsBeginFrame(bool needs_begin_frame) {
   needs_begin_frame_ = needs_begin_frame;
   UpdateNeedsBeginFramesInternal();
 }
 
-void GpuCompositorFrameSink::SubmitCompositorFrame(cc::CompositorFrame frame) {
-  gfx::Size frame_size = frame.render_pass_list[0]->output_rect.size();
+void GpuCompositorFrameSink::SubmitCompositorFrame(
+    const cc::LocalFrameId& local_frame_id,
+    cc::CompositorFrame frame) {
   // 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_valid() || frame_size != last_submitted_frame_size_) {
+  if (local_frame_id_ != local_frame_id) {
     if (local_frame_id_.is_valid())
       surface_factory_.Destroy(local_frame_id_);
-    local_frame_id_ = surface_id_allocator_.GenerateId();
+    local_frame_id_ = local_frame_id;
     surface_factory_.Create(local_frame_id_);
-    if (display_)
+    if (display_) {
+      gfx::Size frame_size;
+      if (!frame.render_pass_list.empty())
+        frame_size = frame.render_pass_list[0]->output_rect.size();
       display_->Resize(frame_size);

[sadrul, 2016/11/22 19:53:29]

Do this Resize only if |frame_size| is non-empty?

[Fady Samuel, 2016/11/22 20:17:26]

Done.

+    }
   }
   ++ack_pending_count_;
   surface_factory_.SubmitCompositorFrame(
       local_frame_id_, std::move(frame),
       base::Bind(&GpuCompositorFrameSink::DidReceiveCompositorFrameAck,
                  base::Unretained(this)));
   if (display_) {
     display_->SetLocalFrameId(local_frame_id_,
                               frame.metadata.device_scale_factor);
   }
-  last_submitted_frame_size_ = frame_size;
 }
 
 void GpuCompositorFrameSink::DidReceiveCompositorFrameAck() {
   if (!client_)
     return;
   client_->DidReceiveCompositorFrameAck();
   DCHECK_GT(ack_pending_count_, 0);
   if (!surface_returned_resources_.empty()) {
     client_->ReclaimResources(surface_returned_resources_);
     surface_returned_resources_.clear();
@@ skipping 114 matching lines @@
 
   added_frame_observer_ = needs_begin_frame_;
   if (needs_begin_frame_)
     begin_frame_source_->AddObserver(this);
   else
     begin_frame_source_->RemoveObserver(this);
 }
 
 }  // namespace ws
 }  // namespace ui