Deleted Widget/FrameViewBase

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

Index: third_party/WebKit/Source/core/frame/FrameView.h
diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h
index 0d6309e544a9cb252fbf7ebb6b4708a4ad94a846..4d0e0640780e843fe37cfc50d3df4e453b2bad8f 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.h
+++ b/third_party/WebKit/Source/core/frame/FrameView.h
@@ -40,7 +40,6 @@
 #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"
@@ -51,6 +50,7 @@
 #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"
@@ -102,7 +102,7 @@ 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);
@@ -126,7 +126,7 @@ class CORE_EXPORT FrameView final
   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));
   }
@@ -649,6 +649,12 @@ class CORE_EXPORT FrameView final
 
   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.
@@ -1262,11 +1268,6 @@ inline void FrameView::IncrementVisuallyNonEmptyPixelCount(
 }
 
 DEFINE_TYPE_CASTS(FrameView,
-                  FrameViewBase,
-                  frameViewBase,
-                  frameViewBase->IsFrameView(),
-                  frameViewBase.IsFrameView());
-DEFINE_TYPE_CASTS(FrameView,
                   FrameOrPlugin,
                   frame_or_plugin,
                   frame_or_plugin->IsFrameView(),