Remove the RenderFrameProxy/RenderFrameImpl observers from RenderWidget.

Now that we've moved all notifications to other paths we can remove
the observer lists since they are no longer used.

BUG=1097816

Change-Id: I64015e6db112b79fb7fa87a4f457ca1348d29392
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2419371
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809065}

content/renderer/render_frame_impl.cc

@@ -2016,9 +2016,6 @@ void RenderFrameImpl::Initialize(blink::WebFrame* parent) {
   if (parent && parent->IsWebLocalFrame()) {
     local_root = parent->ToWebLocalFrame()->LocalRoot();
   }
-  RenderFrameImpl::FromWebFrame(local_root)
-      ->render_widget_->RegisterRenderFrame(this);
-
   bool is_tracing_rail = false;
   bool is_tracing_navigation = false;
   TRACE_EVENT_CATEGORY_GROUP_ENABLED("navigation", &is_tracing_navigation);
@@ -4158,9 +4155,6 @@ void RenderFrameImpl::WillDetach() {
 }
 
 void RenderFrameImpl::FrameDetached() {
-  // Clean up the associated RenderWidget for the frame.
-  GetLocalRootRenderWidget()->UnregisterRenderFrame(this);
-
   // Close/delete the RenderWidget if this frame was a local root.
   if (render_widget_) {
     DCHECK(owned_render_widget_);

content/renderer/render_frame_proxy.cc

@@ -235,9 +235,6 @@ RenderFrameProxy::RenderFrameProxy(int routing_id)
 }
 
 RenderFrameProxy::~RenderFrameProxy() {
-  if (ancestor_render_widget_)
-    ancestor_render_widget_->UnregisterRenderFrameProxy(this);
-
   CHECK(!web_frame_);
   RenderThread::Get()->RemoveRoute(routing_id_);
   g_routing_id_proxy_map.Get().erase(routing_id_);
@@ -278,7 +275,6 @@ void RenderFrameProxy::Init(blink::WebRemoteFrame* web_frame,
             ->WindowSegments();
     pending_visual_properties_.root_widget_window_segments.assign(
         window_segments.begin(), window_segments.end());
-    ancestor_render_widget_->RegisterRenderFrameProxy(this);
     SynchronizeVisualProperties();
   }
 

content/renderer/render_widget.cc

@@ -714,22 +714,6 @@ viz::FrameSinkId RenderWidget::GetFrameSinkId() {
   return viz::FrameSinkId(RenderThread::Get()->GetClientId(), routing_id());
 }
 
-void RenderWidget::RegisterRenderFrameProxy(RenderFrameProxy* proxy) {
-  render_frame_proxies_.AddObserver(proxy);
-}
-
-void RenderWidget::UnregisterRenderFrameProxy(RenderFrameProxy* proxy) {
-  render_frame_proxies_.RemoveObserver(proxy);
-}
-
-void RenderWidget::RegisterRenderFrame(RenderFrameImpl* frame) {
-  render_frames_.AddObserver(frame);
-}
-
-void RenderWidget::UnregisterRenderFrame(RenderFrameImpl* frame) {
-  render_frames_.RemoveObserver(frame);
-}
-
 gfx::PointF RenderWidget::ConvertWindowPointToViewport(
     const gfx::PointF& point) {
   blink::WebFloatRect point_in_viewport(point.x(), point.y(), 0, 0);

content/renderer/render_widget.h

@@ -201,15 +201,6 @@ class CONTENT_EXPORT RenderWidget
   // destroyed RenderWidget.
   bool IsForProvisionalFrame() const;
 
-  // Functions to track out-of-process frames for special notifications.
-  void RegisterRenderFrameProxy(RenderFrameProxy* proxy);
-  void UnregisterRenderFrameProxy(RenderFrameProxy* proxy);
-
-  // Functions to track all RenderFrame objects associated with this
-  // RenderWidget.
-  void RegisterRenderFrame(RenderFrameImpl* frame);
-  void UnregisterRenderFrame(RenderFrameImpl* frame);
-
   // IPC::Listener
   bool OnMessageReceived(const IPC::Message& msg) override;
 
@@ -396,19 +387,6 @@ class CONTENT_EXPORT RenderWidget
   // The time spent in input handlers this frame. Used to throttle input acks.
   base::TimeDelta total_input_handling_time_this_frame_;
 
-  // Lists of RenderFrameProxy objects for which this RenderWidget is their
-  // local root. Each of these represents a child local root RenderWidget in
-  // another RenderView frame tree. For values that are propagated from
-  // a parent RenderWidget to its children, they are plumbed through the
-  // RenderFrameProxys in this list, which bounce those values through the
-  // browser to the child RenderWidget in the correct process.
-  base::ObserverList<RenderFrameProxy>::Unchecked render_frame_proxies_;
-
-  // A list of RenderFrames associated with this RenderWidget. Notifications
-  // are sent to each frame in the list for events such as changing
-  // visibility state for example.
-  base::ObserverList<RenderFrameImpl>::Unchecked render_frames_;
-
   // Mouse Lock dispatcher attached to this view.
   std::unique_ptr<RenderWidgetMouseLockDispatcher> mouse_lock_dispatcher_;