Convert FrameMsg_DidUpdateVisualProperties to mojom interface

This CL converts FrameMsg_DidUpdateVisualProperties to RenderFrameProxy
and removes FrameMsg_DidUpdateVisualProperties message.

Bug: 1051146
Change-Id: I9d13f5d6d81a53910dffed3e28849b9556b5ba34
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2061573Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#742429}

content/browser/frame_host/cross_process_frame_connector.cc

@@ -416,8 +416,7 @@ bool CrossProcessFrameConnector::IsHidden() const {
 
 void CrossProcessFrameConnector::DidUpdateVisualProperties(
     const cc::RenderFrameMetadata& metadata) {
-  frame_proxy_in_parent_renderer_->Send(new FrameMsg_DidUpdateVisualProperties(
-      frame_proxy_in_parent_renderer_->GetRoutingID(), metadata));
+  frame_proxy_in_parent_renderer_->DidUpdateVisualProperties(metadata);
 }
 
 void CrossProcessFrameConnector::SetVisibilityForChildViews(

content/browser/frame_host/render_frame_proxy_host.cc

@@ -457,6 +457,11 @@ void RenderFrameProxyHost::DisableAutoResize() {
   GetAssociatedRenderFrameProxy()->DisableAutoResize();
 }
 
+void RenderFrameProxyHost::DidUpdateVisualProperties(
+    const cc::RenderFrameMetadata& metadata) {
+  GetAssociatedRenderFrameProxy()->DidUpdateVisualProperties(metadata);
+}
+
 void RenderFrameProxyHost::OnRouteMessageEvent(
     const FrameMsg_PostMessage_Params& params) {
   RenderFrameHostImpl* target_rfh = frame_tree_node()->current_frame_host();

content/browser/frame_host/render_frame_proxy_host.h

@@ -169,6 +169,8 @@ class CONTENT_EXPORT RenderFrameProxyHost
   // renderer.
   void DisableAutoResize();
 
+  void DidUpdateVisualProperties(const cc::RenderFrameMetadata& metadata);
+
   blink::AssociatedInterfaceProvider* GetRemoteAssociatedInterfacesTesting();
   bool IsInertForTesting();
 

content/common/frame_messages.h

@@ -18,7 +18,6 @@
 #include "base/optional.h"
 #include "build/build_config.h"
 #include "cc/input/touch_action.h"
-#include "cc/trees/render_frame_metadata.h"
 #include "components/viz/common/surfaces/surface_id.h"
 #include "components/viz/common/surfaces/surface_info.h"
 #include "content/common/buildflags.h"
@@ -233,17 +232,6 @@ IPC_STRUCT_TRAITS_BEGIN(content::FrameVisualProperties)
   IPC_STRUCT_TRAITS_MEMBER(local_surface_id_allocation)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(cc::RenderFrameMetadata)
-  IPC_STRUCT_TRAITS_MEMBER(is_scroll_offset_at_top)
-  IPC_STRUCT_TRAITS_MEMBER(root_background_color)
-  IPC_STRUCT_TRAITS_MEMBER(root_scroll_offset)
-  IPC_STRUCT_TRAITS_MEMBER(selection)
-  IPC_STRUCT_TRAITS_MEMBER(is_mobile_optimized)
-  IPC_STRUCT_TRAITS_MEMBER(device_scale_factor)
-  IPC_STRUCT_TRAITS_MEMBER(viewport_size_in_pixels)
-  IPC_STRUCT_TRAITS_MEMBER(local_surface_id_allocation)
-IPC_STRUCT_TRAITS_END()
-
 IPC_STRUCT_TRAITS_BEGIN(blink::FramePolicy)
   IPC_STRUCT_TRAITS_MEMBER(sandbox_flags)
   IPC_STRUCT_TRAITS_MEMBER(container_policy)
@@ -607,11 +595,6 @@ IPC_MESSAGE_ROUTED1(FrameMsg_ViewChanged,
 IPC_MESSAGE_ROUTED1(FrameMsg_SetTextTrackSettings,
                     FrameMsg_TextTrackSettings_Params /* params */)
 
-// Informs the parent renderer that the child has completed an autoresize
-// transaction and should update with the provided viz::LocalSurfaceId.
-IPC_MESSAGE_ROUTED1(FrameMsg_DidUpdateVisualProperties,
-                    cc::RenderFrameMetadata /* metadata */)
-
 #if BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
 #if defined(OS_MACOSX)
 IPC_MESSAGE_ROUTED1(FrameMsg_SelectPopupMenuItem,

content/common/frame_proxy.mojom

@@ -5,20 +5,27 @@
 module content.mojom;
 
 import "ui/gfx/geometry/mojom/geometry.mojom";
+import "content/common/render_frame_metadata.mojom";
 
 // Mojo interface for communicating from RenderFrameProxy to
-// RenderFrameProxyHost.
+// RenderFrameProxyHost. Implemented by the browser process, called by renderer
+// processes.
 interface RenderFrameProxyHost {
   // TODO(dtapuska): Keep this interface for now. All methods have moved to
   // blink::RemoteFrameHost but we might still need this.
 };
 
 // Mojo interface for communicating from RenderFrameProxyHost to
-// RenderFrameProxy. The Renderer process implements the below interface.
+// RenderFrameProxy. Implemented by renderer processes, called by the browser
+// process.
 interface RenderFrameProxy {
   // This function enables auto-resize mode from the parent renderer.
   EnableAutoResize(gfx.mojom.Size min_size, gfx.mojom.Size max_size);
 
   // This function disables auto-resize-mode from the parent renderer.
   DisableAutoResize();
+
+  // Informs the completion of an autoresize transaction from the parent
+  // renderer and updates with the provided viz::LocalSurfaceId.
+  DidUpdateVisualProperties(RenderFrameMetadata metadata);
 };

content/renderer/render_frame_proxy.cc

@@ -382,8 +382,6 @@ bool RenderFrameProxy::OnMessageReceived(const IPC::Message& msg) {
                         OnEnforceInsecureRequestPolicy)
     IPC_MESSAGE_HANDLER(FrameMsg_SetFrameOwnerProperties,
                         OnSetFrameOwnerProperties)
-    IPC_MESSAGE_HANDLER(FrameMsg_DidUpdateVisualProperties,
-                        OnDidUpdateVisualProperties)
     IPC_MESSAGE_HANDLER(FrameMsg_TransferUserActivationFrom,
                         OnTransferUserActivationFrom)
     IPC_MESSAGE_HANDLER(UnfreezableFrameMsg_DeleteProxy, OnDeleteProxy)
@@ -460,7 +458,7 @@ void RenderFrameProxy::OnTransferUserActivationFrom(int32_t source_routing_id) {
   web_frame()->TransferUserActivationFrom(source_proxy->web_frame());
 }
 
-void RenderFrameProxy::OnDidUpdateVisualProperties(
+void RenderFrameProxy::DidUpdateVisualProperties(
     const cc::RenderFrameMetadata& metadata) {
   if (!parent_local_surface_id_allocator_->UpdateFromChild(
           metadata.local_surface_id_allocation.value_or(

content/renderer/render_frame_proxy.h

@@ -229,10 +229,13 @@ class CONTENT_EXPORT RenderFrameProxy : public IPC::Listener,
   void OnEnforceInsecureRequestPolicy(blink::WebInsecureRequestPolicy policy);
   void OnSetFrameOwnerProperties(const FrameOwnerProperties& properties);
   void OnTransferUserActivationFrom(int32_t source_routing_id);
-  void OnDidUpdateVisualProperties(const cc::RenderFrameMetadata& metadata);
+
+  // mojom::RenderFrameProxy implementation:
   void EnableAutoResize(const gfx::Size& min_size,
                         const gfx::Size& max_size) override;
   void DisableAutoResize() override;
+  void DidUpdateVisualProperties(
+      const cc::RenderFrameMetadata& metadata) override;
 
   // ChildFrameCompositor:
   cc::Layer* GetLayer() override;