Move methods from FrameViewBase to FrameView.

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

 // 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.
 
 #ifndef RemoteFrameView_h
 #define RemoteFrameView_h
 
 #include "core/frame/FrameOrPlugin.h"
+#include "core/frame/FrameView.h"
 #include "platform/FrameViewBase.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/heap/Handle.h"
 
 namespace blink {
 
 class CullRect;
 class GraphicsContext;
 class RemoteFrame;
 
-class RemoteFrameView final : public FrameViewBase, public FrameOrPlugin {
+class RemoteFrameView final : public GarbageCollectedFinalized<RemoteFrameView>,
+                              public FrameViewBase,
+                              public FrameOrPlugin {
   USING_GARBAGE_COLLECTED_MIXIN(RemoteFrameView);
 
  public:
   static RemoteFrameView* Create(RemoteFrame*);
 
   ~RemoteFrameView() override;
 
   bool IsRemoteFrameView() const override { return true; }
   void SetParent(FrameViewBase*) override;
+  FrameViewBase* Parent() const override { return parent_; }
 
   RemoteFrame& GetFrame() const {
     ASSERT(remote_frame_);
     return *remote_frame_;
   }
 
   void Dispose() override;
   // Override to notify remote frame that its viewport size has changed.
   void FrameRectsChanged() override;
   void InvalidateRect(const IntRect&);
   void SetFrameRect(const IntRect&) override;
-  const IntRect& FrameRect() const override {
-    return FrameViewBase::FrameRect();
-  }
+  const IntRect& FrameRect() const override { return frame_rect_; }
+  IntPoint Location() const override { return frame_rect_.Location(); }
   void Paint(GraphicsContext&, const CullRect&) const override {}
   void Hide() override;
   void Show() override;
   void SetParentVisible(bool) override;
 
   IntRect ConvertFromContainingFrameViewBase(const IntRect&) const override;
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   explicit RemoteFrameView(RemoteFrame*);
 
   void UpdateRemoteViewportIntersection();
 
   // The properties and handling of the cycle between RemoteFrame
   // and its RemoteFrameView corresponds to that between LocalFrame
   // and FrameView. Please see the FrameView::m_frame comment for
   // details.
   Member<RemoteFrame> remote_frame_;
-
+  Member<FrameView> parent_;

[dcheng, 2017/04/25 23:38:51]

Are we going to have some way of sharing this between FrameView/RemoteFrameView?

[joelhockey, 2017/04/26 07:48:37]

FrameOrPlugin (LayoutController) could end up holding parent.  It is base class
for PluginView, FrameView and RemoteFrameView.  But I'm more inclined for
FrameOrPlugin to be pure virtual and define SetParent/Parent methods and each
subclass can hold its own fields.

[dcheng, 2017/04/26 08:16:15]

I think the long-term idea is to get rid of the parent_ field, isn't it? My
concern is with the visibility propagation; I'd rather not duplicate that logic
if possible (which it currently is in this CL).

   IntRect last_viewport_intersection_;
+  IntRect frame_rect_;
+  bool self_visible_;
+  bool parent_visible_;
 };
 
 DEFINE_TYPE_CASTS(RemoteFrameView,
                   FrameViewBase,
                   frameViewBase,
                   frameViewBase->IsRemoteFrameView(),
                   frameViewBase.IsRemoteFrameView());
 
 }  // namespace blink
 
 #endif  // RemoteFrameView_h