Remove unneeded Convert* methods and move many from FrameViewBase to FrameView

third_party/WebKit/Source/core/frame/RemoteFrameView.cpp

 // Copyright 2014 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 "core/frame/RemoteFrameView.h"
 
 #include "core/dom/IntersectionObserverEntry.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/RemoteFrame.h"
@@ skipping 86 matching lines @@
   FrameViewBase::SetFrameRect(new_rect);
 
   FrameRectsChanged();
 }
 
 void RemoteFrameView::FrameRectsChanged() {
   // Update the rect to reflect the position of the frame relative to the
   // containing local frame root. The position of the local root within
   // any remote frames, if any, is accounted for by the embedder.
   IntRect new_rect = FrameRect();
-  if (Parent() && Parent()->IsFrameView())
-    new_rect = Parent()->ConvertToRootFrame(
-        ToFrameView(Parent())->ContentsToFrame(new_rect));
+  if (const FrameView* parent = ToFrameView(Parent()))
+    new_rect = parent->ConvertToRootFrame(parent->ContentsToFrame(new_rect));
+
   remote_frame_->Client()->FrameRectsChanged(new_rect);
 
   UpdateRemoteViewportIntersection();
 }
 
 void RemoteFrameView::Hide() {
   SetSelfVisible(false);
 
   remote_frame_->Client()->VisibilityChanged(false);
 }
 
 void RemoteFrameView::Show() {
   SetSelfVisible(true);
 
   remote_frame_->Client()->VisibilityChanged(true);
 }
 
 void RemoteFrameView::SetParentVisible(bool visible) {
   if (IsParentVisible() == visible)
     return;
 
   FrameViewBase::SetParentVisible(visible);
   if (!IsSelfVisible())
     return;
 
   remote_frame_->Client()->VisibilityChanged(IsVisible());
 }
 
+IntRect RemoteFrameView::ConvertFromContainingFrameViewBase(
+    const IntRect& parent_rect) const {
+  if (const FrameView* parent = ToFrameView(Parent())) {
+    IntRect local_rect = parent_rect;
+    local_rect.SetLocation(
+        parent->ConvertSelfToChild(this, local_rect.Location()));
+    return local_rect;
+  }
+
+  return parent_rect;
+}
+
 DEFINE_TRACE(RemoteFrameView) {
   visitor->Trace(remote_frame_);
   FrameViewBase::Trace(visitor);
 }
 
 }  // namespace blink