Deleted Widget/FrameViewBase

third_party/WebKit/Source/platform/scroll/Scrollbar.h

Index: third_party/WebKit/Source/platform/scroll/Scrollbar.h
diff --git a/third_party/WebKit/Source/platform/scroll/Scrollbar.h b/third_party/WebKit/Source/platform/scroll/Scrollbar.h
index b9541884a4334ca91399a4411cc6efe9dd72680f..d4046cebb437533370b712dd964e1bb7b4128079 100644
--- a/third_party/WebKit/Source/platform/scroll/Scrollbar.h
+++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.h
@@ -36,11 +36,11 @@
 namespace blink {
 
 class CullRect;
-class FrameViewBase;
 class GraphicsContext;
 class IntRect;
 class PlatformChromeClient;
 class ScrollableArea;
+class ScrollbarParent;
 class ScrollbarTheme;
 class WebGestureEvent;
 class WebMouseEvent;
@@ -75,8 +75,8 @@ class PLATFORM_EXPORT Scrollbar : public GarbageCollectedFinalized<Scrollbar>,
   IntSize Size() const override { return frame_rect_.Size(); }
   IntPoint Location() const override { return frame_rect_.Location(); }
 
-  virtual void SetParent(FrameViewBase* parent) { parent_ = parent; }
-  FrameViewBase* Parent() const { return parent_; }
+  virtual void SetParent(ScrollbarParent* parent) { parent_ = parent; }
+  ScrollbarParent* Parent() const { return parent_; }
 
   void SetFrameRect(const IntRect&);
   IntRect FrameRect() const override { return frame_rect_; }
@@ -85,8 +85,7 @@ class PLATFORM_EXPORT Scrollbar : public GarbageCollectedFinalized<Scrollbar>,
   void GetTickmarks(Vector<IntRect>&) const override;
   bool IsScrollableAreaActive() const override;
 
-  IntPoint ConvertFromRootFrame(
-      const IntPoint& point_in_root_frame) const override;
+  IntPoint ConvertPointFromRootFrame(const IntPoint&) const override;
 
   bool IsCustomScrollbar() const override { return false; }
   ScrollbarOrientation Orientation() const override { return orientation_; }
@@ -252,7 +251,7 @@ class PLATFORM_EXPORT Scrollbar : public GarbageCollectedFinalized<Scrollbar>,
   bool track_needs_repaint_;
   bool thumb_needs_repaint_;
   LayoutRect visual_rect_;
-  Member<FrameViewBase> parent_;
+  Member<ScrollbarParent> parent_;
   IntRect frame_rect_;
 };