Convert FrameHostMsg_UpdateRenderThrottlingStatus to mojo

This CL converts FrameHostMsg_UpdateRenderThrottlingStatus to
RemoteFrameHost blink interface. It removes
UpdateRenderThrottlingStatus from WebRemoteFrameClient.

Bug: 1047362
Change-Id: Icc479058169016353dc58039aa4f311c5d1534da
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2053872Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#741408}

content/browser/frame_host/cross_process_frame_connector.cc

@@ -73,8 +73,6 @@ bool CrossProcessFrameConnector::OnMessageReceived(const IPC::Message& msg) {
                         OnSynchronizeVisualProperties)
     IPC_MESSAGE_HANDLER(FrameHostMsg_UpdateViewportIntersection,
                         OnUpdateViewportIntersection)
-    IPC_MESSAGE_HANDLER(FrameHostMsg_UpdateRenderThrottlingStatus,
-                        OnUpdateRenderThrottlingStatus)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
@@ -460,7 +458,7 @@ void CrossProcessFrameConnector::ResetScreenSpaceRect() {
   last_received_local_frame_size_ = gfx::Size();
 }
 
-void CrossProcessFrameConnector::OnUpdateRenderThrottlingStatus(
+void CrossProcessFrameConnector::UpdateRenderThrottlingStatus(
     bool is_throttled,
     bool subtree_throttled) {
   if (is_throttled != is_throttled_ ||

content/browser/frame_host/cross_process_frame_connector.h

@@ -127,6 +127,8 @@ class CONTENT_EXPORT CrossProcessFrameConnector
     return GetRootRenderWidgetHostView();
   }
 
+  void UpdateRenderThrottlingStatus(bool is_throttled, bool subtree_throttled);
+
   // These enums back crashed frame histograms - see MaybeLogCrash() and
   // MaybeLogShownCrash() below.  Please do not modify or remove existing enum
   // values.  When adding new values, please also update enums.xml. See
@@ -180,8 +182,6 @@ class CONTENT_EXPORT CrossProcessFrameConnector
       const FrameVisualProperties& visual_properties);
   void OnUpdateViewportIntersection(
       const blink::ViewportIntersectionState& viewport_intersection);
-  void OnUpdateRenderThrottlingStatus(bool is_throttled,
-                                      bool subtree_throttled);
 
   // Gets the current RenderFrameHost for the
   // |frame_proxy_in_parent_renderer_|'s (i.e., the child frame's)

content/browser/frame_host/render_frame_proxy_host.cc

@@ -326,6 +326,13 @@ void RenderFrameProxyHost::SetInheritedEffectiveTouchAction(
       touch_action);
 }
 
+void RenderFrameProxyHost::UpdateRenderThrottlingStatus(
+    bool is_throttled,
+    bool subtree_throttled) {
+  cross_process_frame_connector_->UpdateRenderThrottlingStatus(
+      is_throttled, subtree_throttled);
+}
+
 void RenderFrameProxyHost::VisibilityChanged(
     blink::mojom::FrameVisibility visibility) {
   cross_process_frame_connector_->OnVisibilityChanged(visibility);

content/browser/frame_host/render_frame_proxy_host.h

@@ -148,6 +148,8 @@ class CONTENT_EXPORT RenderFrameProxyHost
 
   // blink::mojom::RemoteFrameHost
   void SetInheritedEffectiveTouchAction(cc::TouchAction touch_action) override;
+  void UpdateRenderThrottlingStatus(bool is_throttled,
+                                    bool subtree_throttled) override;
   void VisibilityChanged(blink::mojom::FrameVisibility visibility) override;
   void DidFocusFrame() override;
   void CheckCompleted() override;

content/common/frame_messages.h

@@ -910,14 +910,6 @@ IPC_MESSAGE_ROUTED2(FrameHostMsg_SynchronizeVisualProperties,
 IPC_MESSAGE_ROUTED1(FrameHostMsg_UpdateViewportIntersection,
                     blink::ViewportIntersectionState /* intersection_state */)
 
-// Toggles render throttling on a remote frame. |is_throttled| indicates
-// whether the current frame should be throttled based on its viewport
-// visibility, and |subtree_throttled| indicates that an ancestor frame has
-// been throttled, so all descendant frames also should be throttled.
-IPC_MESSAGE_ROUTED2(FrameHostMsg_UpdateRenderThrottlingStatus,
-                    bool /* is_throttled */,
-                    bool /* subtree_throttled */)
-
 // Transfers user activation state from the source frame to the current frame.
 IPC_MESSAGE_ROUTED1(FrameMsg_TransferUserActivationFrom,
                     int /* source_routing_id */)

content/renderer/render_frame_proxy.cc

@@ -736,12 +736,6 @@ void RenderFrameProxy::UpdateRemoteViewportIntersection(
   Send(new FrameHostMsg_UpdateViewportIntersection(routing_id_, new_state));
 }
 
-void RenderFrameProxy::UpdateRenderThrottlingStatus(bool is_throttled,
-                                                    bool subtree_throttled) {
-  Send(new FrameHostMsg_UpdateRenderThrottlingStatus(routing_id_, is_throttled,
-                                                     subtree_throttled));
-}
-
 void RenderFrameProxy::DidChangeOpener(blink::WebFrame* opener) {
   // A proxy shouldn't normally be disowning its opener.  It is possible to get
   // here when a proxy that is being detached clears its opener, in which case

content/renderer/render_frame_proxy.h

@@ -190,8 +190,6 @@ class CONTENT_EXPORT RenderFrameProxy : public IPC::Listener,
                          const blink::WebRect& screen_space_rect) override;
   void UpdateRemoteViewportIntersection(
       const blink::ViewportIntersectionState& intersection_state) override;
-  void UpdateRenderThrottlingStatus(bool is_throttled,
-                                    bool subtree_throttled) override;
   void DidChangeOpener(blink::WebFrame* opener) override;
   void AdvanceFocus(blink::mojom::FocusType type,
                     blink::WebLocalFrame* source) override;

third_party/blink/public/mojom/frame/frame.mojom

@@ -373,6 +373,12 @@ interface RemoteFrameHost {
   // the associated LocalFrame in the other render process.
   SetInheritedEffectiveTouchAction(cc.mojom.TouchAction touch_action);
 
+  // Toggles render throttling on a remote frame. |is_throttled| indicates
+  // whether the current frame should be throttled based on its viewport
+  // visibility, and |subtree_throttled| indicates that an ancestor frame has
+  // been throttled, so all descendant frames also should be throttled.
+  UpdateRenderThrottlingStatus(bool is_throttled, bool subtree_throttled);
+
   // Notifies the browser that the associated frame has changed its visibility
   // status. Visibility status changes occur when the frame moves in/out
   // of the viewport, or the need for a layout object changes, e.g. if the

third_party/blink/public/web/web_remote_frame_client.h

@@ -48,10 +48,6 @@ class WebRemoteFrameClient {
   virtual void UpdateRemoteViewportIntersection(
       const ViewportIntersectionState& intersection_state) {}
 
-  // Toggles render throttling for the remote frame.
-  virtual void UpdateRenderThrottlingStatus(bool is_throttled,
-                                            bool subtree_throttled) {}
-
   // This frame updated its opener to another frame.
   virtual void DidChangeOpener(WebFrame* opener) {}
 

third_party/blink/renderer/core/frame/remote_frame_client.h

@@ -53,9 +53,6 @@ class RemoteFrameClient : public FrameClient {
 
   virtual void AdvanceFocus(mojom::blink::FocusType, LocalFrame* source) = 0;
 
-  virtual void UpdateRenderThrottlingStatus(bool isThrottled,
-                                            bool subtreeThrottled) = 0;
-
   virtual uint32_t Print(const IntRect&, cc::PaintCanvas*) const = 0;
 };
 

third_party/blink/renderer/core/frame/remote_frame_client_impl.cc

@@ -152,13 +152,6 @@ void RemoteFrameClientImpl::AdvanceFocus(mojom::blink::FocusType type,
                                      WebLocalFrameImpl::FromFrame(source));
 }
 
-void RemoteFrameClientImpl::UpdateRenderThrottlingStatus(
-    bool is_throttled,
-    bool subtree_throttled) {
-  web_frame_->Client()->UpdateRenderThrottlingStatus(is_throttled,
-                                                     subtree_throttled);
-}
-
 uint32_t RemoteFrameClientImpl::Print(const IntRect& rect,
                                       cc::PaintCanvas* canvas) const {
   return web_frame_->Client()->Print(rect, canvas);

third_party/blink/renderer/core/frame/remote_frame_client_impl.h

@@ -48,8 +48,6 @@ class RemoteFrameClientImpl final : public RemoteFrameClient {
   void UpdateRemoteViewportIntersection(
       const ViewportIntersectionState& intersection_state) override;
   void AdvanceFocus(mojom::blink::FocusType, LocalFrame*) override;
-  void UpdateRenderThrottlingStatus(bool is_throttled,
-                                    bool subtree_throttled) override;
   uint32_t Print(const IntRect&, cc::PaintCanvas*) const override;
 
   WebRemoteFrameImpl* GetWebFrame() const { return web_frame_; }

third_party/blink/renderer/core/frame/remote_frame_view.cc

@@ -261,10 +261,8 @@ void RemoteFrameView::ParentVisibleChanged() {
 
 void RemoteFrameView::VisibilityForThrottlingChanged() {
   TRACE_EVENT0("blink", "RemoteFrameView::VisibilityForThrottlingChanged");
-  if (!remote_frame_->Client())
-    return;
-  remote_frame_->Client()->UpdateRenderThrottlingStatus(IsHiddenForThrottling(),
-                                                        IsSubtreeThrottled());
+  remote_frame_->GetRemoteFrameHostRemote().UpdateRenderThrottlingStatus(
+      IsHiddenForThrottling(), IsSubtreeThrottled());
 }
 
 void RemoteFrameView::VisibilityChanged(

third_party/blink/renderer/core/loader/empty_clients.h

@@ -452,8 +452,6 @@ class CORE_EXPORT EmptyRemoteFrameClient : public RemoteFrameClient {
   void UpdateRemoteViewportIntersection(
       const ViewportIntersectionState& intersection_state) override {}
   void AdvanceFocus(mojom::blink::FocusType, LocalFrame* source) override {}
-  void UpdateRenderThrottlingStatus(bool is_throttled,
-                                    bool subtree_throttled) override {}
   uint32_t Print(const IntRect& rect, cc::PaintCanvas* canvas) const override {
     return 0;
   }

third_party/blink/renderer/core/testing/fake_remote_frame_host.cc

@@ -16,6 +16,10 @@ void FakeRemoteFrameHost::Init(blink::AssociatedInterfaceProvider* provider) {
 void FakeRemoteFrameHost::SetInheritedEffectiveTouchAction(
     cc::TouchAction touch_action) {}
 
+void FakeRemoteFrameHost::UpdateRenderThrottlingStatus(bool is_throttled,
+                                                       bool subtree_throttled) {
+}
+
 void FakeRemoteFrameHost::VisibilityChanged(
     mojom::blink::FrameVisibility visibility) {}
 

third_party/blink/renderer/core/testing/fake_remote_frame_host.h

@@ -22,6 +22,8 @@ class FakeRemoteFrameHost : public mojom::blink::RemoteFrameHost {
 
   void Init(blink::AssociatedInterfaceProvider* provider);
   void SetInheritedEffectiveTouchAction(cc::TouchAction touch_action) override;
+  void UpdateRenderThrottlingStatus(bool is_throttled,
+                                    bool subtree_throttled) override;
   void VisibilityChanged(mojom::blink::FrameVisibility visibility) override;
   void DidFocusFrame() override;
   void CheckCompleted() override;