Deleted Widget/FrameViewBase

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 22 matching lines @@
 #include "core/frame/FrameViewAutoSizeInfo.h"
 #include "core/frame/LayoutSubtreeRootList.h"
 #include "core/frame/RootFrameViewport.h"
 #include "core/layout/MapCoordinatesFlags.h"
 #include "core/layout/ScrollAnchor.h"
 #include "core/paint/FirstMeaningfulPaintDetector.h"
 #include "core/paint/ObjectPaintProperties.h"
 #include "core/paint/PaintInvalidationCapableScrollableArea.h"
 #include "core/paint/PaintPhase.h"
 #include "core/paint/ScrollbarManager.h"
-#include "platform/FrameViewBase.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/animation/CompositorAnimationHost.h"
 #include "platform/animation/CompositorAnimationTimeline.h"
 #include "platform/geometry/IntRect.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/CompositorElementId.h"
 #include "platform/graphics/GraphicsLayerClient.h"
 #include "platform/scroll/ScrollTypes.h"
 #include "platform/scroll/Scrollbar.h"
+#include "platform/scroll/ScrollbarParent.h"
 #include "platform/wtf/Allocator.h"
 #include "platform/wtf/AutoReset.h"
 #include "platform/wtf/Forward.h"
 #include "platform/wtf/HashSet.h"
 #include "platform/wtf/ListHashSet.h"
 #include "platform/wtf/text/WTFString.h"
 #include "public/platform/ShapeProperties.h"
 #include "public/platform/WebDisplayMode.h"
 #include "public/platform/WebRect.h"
 
@@ skipping 31 matching lines @@
 class ScrollingCoordinator;
 class TracedValue;
 class TransformState;
 struct AnnotatedRegionValue;
 struct CompositedSelection;
 
 typedef unsigned long long DOMTimeStamp;
 
 class CORE_EXPORT FrameView final
     : public GarbageCollectedFinalized<FrameView>,
-      public FrameViewBase,
+      public ScrollbarParent,

[haraken, 2017/05/01 07:51:58]

Are you planning to remove this inheritance in the end state?

It looks a bit strange that things other than Scrollbar inherits from
ScrollbarParent.

[joelhockey, 2017/05/01 09:08:51]

No, FrameView will remain as Scrollbar's parent.  It is the only class that
implements ScrollbarParent.

btw, Scrollbar does not (any longer) inherit from ScrollbarParent - it is not
its own parent.  Previously, Scrollbar did inherit from Widget, and Widget was
also the parent of scrollbar.  It reminds me of https://youtu.be/eYlJH81dSiw
Now that Scrollbar is a specialized child of FrameView, there is no need for it
to inherit Widget.

       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 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(); }
+  IntPoint Location() const { return frame_rect_.Location(); }
   void Resize(int width, int height) {
     SetFrameRect(IntRect(frame_rect_.X(), frame_rect_.Y(), width, height));
   }
   void Resize(const IntSize& size) { SetFrameRect(IntRect(Location(), size)); }
 
   LocalFrame& GetFrame() const {
     ASSERT(frame_);
     return *frame_;
   }
 
@@ skipping 502 matching lines @@
 
   // Functions for converting to screen coordinates.
   IntRect ContentsToScreen(const IntRect&) const;
 
   // For platforms that need to hit test scrollbars from within the engine's
   // event handlers (like Win32).
   Scrollbar* ScrollbarAtFramePoint(const IntPoint&);
 
   IntRect ConvertToRootFrame(const IntRect&) const;
   IntPoint ConvertToRootFrame(const IntPoint&) const;
+  IntRect ConvertFromRootFrame(const IntRect&) const;
+  IntPoint ConvertFromRootFrame(const IntPoint&) const;
+  FloatPoint ConvertFromRootFrame(const FloatPoint&) const;
+  IntPoint ConvertPointFromRootFrame(const IntPoint& point) const override {
+    return ConvertFromRootFrame(point);
+  }
   IntPoint ConvertSelfToChild(const IntPoint&, const IntPoint&) const;
 
   // 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;
 
   void Show() override;
@@ skipping 593 matching lines @@
     return;
   visually_non_empty_pixel_count_ += size.Area();
   // Use a threshold value to prevent very small amounts of visible content from
   // triggering didMeaningfulLayout.
   static const unsigned kVisualPixelThreshold = 32 * 32;
   if (visually_non_empty_pixel_count_ > kVisualPixelThreshold)
     SetIsVisuallyNonEmpty();
 }
 
 DEFINE_TYPE_CASTS(FrameView,
-                  FrameViewBase,
-                  frameViewBase,
-                  frameViewBase->IsFrameView(),
-                  frameViewBase.IsFrameView());
-DEFINE_TYPE_CASTS(FrameView,
                   FrameOrPlugin,
                   frame_or_plugin,
                   frame_or_plugin->IsFrameView(),
                   frame_or_plugin.IsFrameView());
 DEFINE_TYPE_CASTS(FrameView,
                   ScrollableArea,
                   scrollable_area,
                   scrollable_area->IsFrameView(),
                   scrollable_area.IsFrameView());
 
 }  // namespace blink
 
 #endif  // FrameView_h