Factor FrameData out of RendererCompositorFrameSink

content/renderer/gpu/renderer_compositor_frame_sink.h

 // 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.
 
 #ifndef CONTENT_RENDERER_GPU_RENDERER_COMPOSITOR_FRAME_SINK_H_
 #define CONTENT_RENDERER_GPU_RENDERER_COMPOSITOR_FRAME_SINK_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "cc/input/selection.h"
 #include "cc/ipc/mojo_compositor_frame_sink.mojom.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/output/compositor_frame_sink.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/local_surface_id.h"
 #include "cc/surfaces/local_surface_id_allocator.h"
+#include "content/common/render_widget_surface_properties.h"
 #include "content/renderer/gpu/compositor_forwarding_message_filter.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "ui/gfx/selection_bound.h"
 
 namespace IPC {
 class Message;
 }
 
 namespace cc {
@@ skipping 51 matching lines @@
     friend class base::RefCountedThreadSafe<RendererCompositorFrameSinkProxy>;
     ~RendererCompositorFrameSinkProxy() {}
     RendererCompositorFrameSink* compositor_frame_sink_;
 
     DISALLOW_COPY_AND_ASSIGN(RendererCompositorFrameSinkProxy);
   };
 
   void OnMessageReceived(const IPC::Message& message);
   void OnBeginFrameIPC(const cc::BeginFrameArgs& args);
 
-  bool ShouldAllocateNewLocalSurfaceId(const cc::CompositorFrame& frame);
-  void UpdateFrameData(const cc::CompositorFrame& frame);
-
   // cc::mojom::MojoCompositorFrameSinkClient implementation.
   void DidReceiveCompositorFrameAck(
       const cc::ReturnedResourceArray& resources) override;
   void OnBeginFrame(const cc::BeginFrameArgs& args) override;
   void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
 
   // cc::ExternalBeginFrameSourceClient implementation.
   void OnNeedsBeginFrames(bool need_begin_frames) override;
   void OnDidFinishFrame(const cc::BeginFrameAck& ack) override;
 
   void EstablishMojoConnection();
 
   scoped_refptr<CompositorForwardingMessageFilter>
       compositor_frame_sink_filter_;
   CompositorForwardingMessageFilter::Handler
       compositor_frame_sink_filter_handler_;
   scoped_refptr<RendererCompositorFrameSinkProxy> compositor_frame_sink_proxy_;
   scoped_refptr<IPC::SyncMessageFilter> message_sender_;
   scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
   std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source_;
   std::unique_ptr<cc::ExternalBeginFrameSource> external_begin_frame_source_;
   int routing_id_;
 
   cc::LocalSurfaceId local_surface_id_;
   cc::LocalSurfaceIdAllocator id_allocator_;
-  struct {
-    gfx::Size frame_size;
-    float device_scale_factor;
-#ifdef OS_ANDROID
-    float top_controls_height;
-    float top_controls_shown_ratio;
-    float bottom_controls_height;
-    float bottom_controls_shown_ratio;
-    cc::Selection<gfx::SelectionBound> viewport_selection;
-    bool has_transparent_background;
-#endif
-  } current_frame_data_;
+  RenderWidgetSurfaceProperties current_surface_properties_;
 
   base::ThreadChecker thread_checker_;
 
   cc::mojom::MojoCompositorFrameSinkPtr sink_;
   cc::mojom::MojoCompositorFrameSinkPtrInfo sink_ptr_info_;
   cc::mojom::MojoCompositorFrameSinkClientRequest sink_client_request_;
   mojo::Binding<cc::mojom::MojoCompositorFrameSinkClient> sink_client_binding_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_GPU_RENDERER_COMPOSITOR_FRAME_SINK_H_