Move methods from FrameViewBase to FrameView.

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

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
    reserved.
 
    This library is free software; you can redistribute it and/or
@@ skipping 84 matching lines @@
 class PrintContext;
 class ScrollingCoordinator;
 class TracedValue;
 class TransformState;
 struct AnnotatedRegionValue;
 struct CompositedSelection;
 
 typedef unsigned long long DOMTimeStamp;
 
 class CORE_EXPORT FrameView final
-    : public FrameViewBase,
+    : public GarbageCollectedFinalized<FrameView>,
+      public FrameViewBase,
       public FrameOrPlugin,
       public PaintInvalidationCapableScrollableArea {
   USING_GARBAGE_COLLECTED_MIXIN(FrameView);
 
   friend class PaintControllerPaintTestBase;
   friend class Internals;
   friend class LayoutPart;  // for invalidateTreeIfNeeded
 
  public:
   static FrameView* Create(LocalFrame&);
   static FrameView* Create(LocalFrame&, const IntSize& initial_size);
 
   ~FrameView() override;
 
   void Invalidate() { InvalidateRect(IntRect(0, 0, Width(), Height())); }
   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_; }
+  int X() const { return frame_rect_.X(); }
+  int Y() const { return frame_rect_.Y(); }
+  int Width() const { return frame_rect_.Width(); }
+  int Height() const { return frame_rect_.Height(); }
+  IntSize Size() const { return frame_rect_.Size(); }
+  IntPoint Location() const override { return frame_rect_.Location(); }
+  void Resize(int w, int h) {

[haraken, 2017/04/26 07:42:14]

width
height

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

Done

+    SetFrameRect(IntRect(frame_rect_.X(), frame_rect_.Y(), w, h));
   }
+  void Resize(const IntSize& s) { SetFrameRect(IntRect(Location(), s)); }

[haraken, 2017/04/26 07:42:14]

size

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

Done

 
   LocalFrame& GetFrame() const {
     ASSERT(frame_);
     return *frame_;
   }
 
   Page* GetPage() const;
 
   // TODO(pilgrim) replace all instances of layoutView() with layoutViewItem()
   // https://crbug.com/499321
@@ skipping 331 matching lines @@
 
   // The window that hosts the FrameView. The FrameView will communicate scrolls
   // and repaints to the host window in the window's coordinate space.
   PlatformChromeClient* GetChromeClient() const;
 
   typedef HeapHashSet<Member<FrameViewBase>> ChildrenSet;
   typedef HeapHashSet<Member<PluginView>> PluginsSet;
   typedef HeapHashSet<Member<Scrollbar>> ScrollbarsSet;
 
   // Functions for child manipulation and inspection.
+  bool IsSelfVisible() const {
+    return self_visible_;
+  }  // Whether or not we have been explicitly marked as visible or not.
+  bool IsParentVisible() const {
+    return parent_visible_;
+  }  // Whether or not our parent is visible.
+  bool IsVisible() const {
+    return self_visible_ && parent_visible_;
+  }  // Whether or not we are actually visible.
+  void SetParentVisible(bool);
+  void SetSelfVisible(bool v) { self_visible_ = v; }
   void SetParent(FrameViewBase*) override;
+  FrameViewBase* Parent() const override { return parent_; }
+  FrameView* Root() const;
   void RemoveChild(FrameViewBase*);
   void AddChild(FrameViewBase*);
   const ChildrenSet* Children() const { return &children_; }
   void RemovePlugin(PluginView*);
   void AddPlugin(PluginView*);
   const PluginsSet* Plugins() const { return &plugins_; }
   void RemoveScrollbar(Scrollbar*);
   void AddScrollbar(Scrollbar*);
   const ScrollbarsSet* Scrollbars() const { return &scrollbars_; }
 
@@ skipping 145 matching lines @@
   IntPoint ConvertSelfToChild(const FrameViewBase*, const IntPoint&) const;
 
   // FrameViewBase override. Handles painting of the contents of the view as
   // well as the scrollbars.
   void Paint(GraphicsContext&, const CullRect&) const override;
   void Paint(GraphicsContext&, const GlobalPaintFlags, const CullRect&) const;
   void PaintContents(GraphicsContext&,
                      const GlobalPaintFlags,
                      const IntRect& damage_rect) const;
 
-  // FrameViewBase overrides to ensure that our children's visibility status is
-  // kept up to date when we get shown and hidden.
   void Show() override;
   void Hide() override;
-  void SetParentVisible(bool) override;
 
   bool IsPointInScrollbarCorner(const IntPoint&);
   bool ScrollbarCornerPresent() const;
   IntRect ScrollCornerRect() const override;
 
   IntPoint ConvertFromContainingFrameViewBaseToScrollbar(
       const Scrollbar&,
       const IntPoint&) const override;
 
   bool IsFrameView() const override { return true; }
@@ skipping 210 matching lines @@
         : scope_(&view->in_update_scrollbars_, true) {}
 
    private:
     AutoReset<bool> scope_;
   };
 
   // Only for LayoutPart to traverse into sub frames during paint invalidation.
   void InvalidateTreeIfNeeded(const PaintInvalidationState&);
 
  private:
-  explicit FrameView(LocalFrame&);
+  explicit FrameView(LocalFrame&, IntRect);
   class ScrollbarManager : public blink::ScrollbarManager {
     DISALLOW_NEW();
 
     // Helper class to manage the life cycle of Scrollbar objects.
    public:
     ScrollbarManager(FrameView& scroller) : blink::ScrollbarManager(scroller) {}
 
     void SetHasHorizontalScrollbar(bool has_scrollbar) override;
     void SetHasVerticalScrollbar(bool has_scrollbar) override;
 
@@ skipping 158 matching lines @@
 
   typedef HashSet<RefPtr<LayoutEmbeddedObject>> EmbeddedObjectSet;
   EmbeddedObjectSet part_update_set_;
 
   // FIXME: These are just "children" of the FrameView and should be
   // Member<FrameViewBase> instead.
   HashSet<RefPtr<LayoutPart>> parts_;
 
   Member<LocalFrame> frame_;
 
+  IntRect frame_rect_;
+  Member<FrameView> parent_;
+  bool self_visible_;
+  bool parent_visible_;
+
   WebDisplayMode display_mode_;
 
   DisplayShape display_shape_;
 
   bool can_have_scrollbars_;
 
   bool has_pending_layout_;
   LayoutSubtreeRootList layout_subtree_root_list_;
   DepthOrderedLayoutObjectList orthogonal_writing_mode_root_list_;
 
@@ skipping 182 matching lines @@
                   frameViewBase.IsFrameView());
 DEFINE_TYPE_CASTS(FrameView,
                   ScrollableArea,
                   scrollableArea,
                   scrollableArea->IsFrameView(),
                   scrollableArea.IsFrameView());
 
 }  // namespace blink
 
 #endif  // FrameView_h