Factor FrameData out of RendererCompositorFrameSink

content/renderer/gpu/renderer_compositor_frame_sink.cc

 // Copyright (c) 2012 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 "content/renderer/gpu/renderer_compositor_frame_sink.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 107 matching lines @@
   sink_.reset();
   sink_client_binding_.Close();
   cc::CompositorFrameSink::DetachFromClient();
 }
 
 void RendererCompositorFrameSink::SubmitCompositorFrame(
     cc::CompositorFrame frame) {
   // We should only submit CompositorFrames with valid BeginFrameAcks.
   DCHECK_LE(cc::BeginFrameArgs::kStartingFrameNumber,
             frame.metadata.begin_frame_ack.sequence_number);
-  if (ShouldAllocateNewLocalSurfaceId(frame))
+  auto new_surface_properties =
+      RenderWidgetSurfaceProperties::FromCompositorFrame(frame);
+  if (!local_surface_id_.is_valid() ||
+      new_surface_properties != current_surface_properties_) {
     local_surface_id_ = id_allocator_.GenerateId();
-  UpdateFrameData(frame);
+    current_surface_properties_ = new_surface_properties;
+  }
 
   {
     std::unique_ptr<FrameSwapMessageQueue::SendMessageScope>
         send_message_scope =
             frame_swap_message_queue_->AcquireSendMessageScope();
     std::vector<std::unique_ptr<IPC::Message>> messages;
     frame_swap_message_queue_->DrainMessages(&messages);
     std::vector<IPC::Message> messages_to_send;
     FrameSwapMessageQueue::TransferMessages(&messages, &messages_to_send);
     uint32_t frame_token = 0;
@@ skipping 16 matching lines @@
     IPC_MESSAGE_HANDLER(ViewMsg_BeginFrame, OnBeginFrameIPC)
   IPC_END_MESSAGE_MAP()
 }
 
 void RendererCompositorFrameSink::OnBeginFrameIPC(
     const cc::BeginFrameArgs& args) {
   if (external_begin_frame_source_)
     external_begin_frame_source_->OnBeginFrame(args);
 }
 
-bool RendererCompositorFrameSink::ShouldAllocateNewLocalSurfaceId(
-    const cc::CompositorFrame& frame) {
-  cc::RenderPass* root_pass = frame.render_pass_list.back().get();
-  gfx::Size frame_size = root_pass->output_rect.size();
-
-  // Once the proposal in crbug.com/689754 is implemented, the LocalSurfaceId
-  // allocation logic will be unified across all platforms.
-  return !local_surface_id_.is_valid() ||
-         current_frame_data_.device_scale_factor !=
-             frame.metadata.device_scale_factor ||
-#ifdef OS_ANDROID
-         current_frame_data_.top_controls_height !=
-             frame.metadata.top_controls_height ||
-         current_frame_data_.top_controls_shown_ratio !=
-             frame.metadata.top_controls_shown_ratio ||
-         current_frame_data_.bottom_controls_height !=
-             frame.metadata.bottom_controls_height ||
-         current_frame_data_.bottom_controls_shown_ratio !=
-             frame.metadata.bottom_controls_shown_ratio ||
-         current_frame_data_.viewport_selection != frame.metadata.selection ||
-         current_frame_data_.has_transparent_background !=
-             root_pass->has_transparent_background ||
-#endif
-         current_frame_data_.frame_size != frame_size;
-}
-
-void RendererCompositorFrameSink::UpdateFrameData(
-    const cc::CompositorFrame& frame) {
-  cc::RenderPass* root_pass = frame.render_pass_list.back().get();
-  gfx::Size frame_size = root_pass->output_rect.size();
-
-  current_frame_data_.frame_size = frame_size;
-  current_frame_data_.device_scale_factor = frame.metadata.device_scale_factor;
-#ifdef OS_ANDROID
-  current_frame_data_.top_controls_height = frame.metadata.top_controls_height;
-  current_frame_data_.top_controls_shown_ratio =
-      frame.metadata.top_controls_shown_ratio;
-  current_frame_data_.bottom_controls_height =
-      frame.metadata.bottom_controls_height;
-  current_frame_data_.bottom_controls_shown_ratio =
-      frame.metadata.bottom_controls_shown_ratio;
-  current_frame_data_.viewport_selection = frame.metadata.selection;
-  current_frame_data_.has_transparent_background =
-      root_pass->has_transparent_background;
-#endif
-}
-
 void RendererCompositorFrameSink::DidReceiveCompositorFrameAck(
     const cc::ReturnedResourceArray& resources) {
   ReclaimResources(resources);
   client_->DidReceiveCompositorFrameAck();
 }
 
 void RendererCompositorFrameSink::OnBeginFrame(const cc::BeginFrameArgs& args) {
   // See crbug.com/709689.
   NOTREACHED() << "BeginFrames are delivered using Chrome IPC.";
 }
@@ skipping 20 matching lines @@
   cc::mojom::MojoCompositorFrameSinkRequest sink_request =
       mojo::MakeRequest(&sink);
   cc::mojom::MojoCompositorFrameSinkClientPtr sink_client;
   sink_client_request_ = mojo::MakeRequest(&sink_client);
   RenderThreadImpl::current()->GetFrameSinkProvider()->CreateForWidget(
       routing_id_, std::move(sink_request), std::move(sink_client));
   sink_ptr_info_ = sink.PassInterface();
 }
 
 }  // namespace content