Deleted Widget/FrameViewBase

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

Index: third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
index 74718916c379e18add8d5b9466b6101c6c9f5bf1..93f1db32f3974aee5dbcbd24ce9c9c3c6ce0c855 100644
--- a/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
+++ b/third_party/WebKit/Source/platform/scroll/Scrollbar.cpp
@@ -26,12 +26,12 @@
 #include "platform/scroll/Scrollbar.h"
 
 #include <algorithm>
-#include "platform/FrameViewBase.h"
 #include "platform/PlatformChromeClient.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/graphics/paint/CullRect.h"
 #include "platform/scroll/ScrollAnimatorBase.h"
 #include "platform/scroll/ScrollableArea.h"
+#include "platform/scroll/ScrollbarParent.h"
 #include "platform/scroll/ScrollbarTheme.h"
 #include "public/platform/WebGestureEvent.h"
 #include "public/platform/WebMouseEvent.h"
@@ -337,8 +337,8 @@ bool Scrollbar::GestureEvent(const WebGestureEvent& evt,
       IntPoint position = FlooredIntPoint(evt.PositionInRootFrame());
       SetPressedPart(GetTheme().HitTest(*this, position));
       pressed_pos_ = Orientation() == kHorizontalScrollbar
-                         ? ConvertFromRootFrame(position).X()
-                         : ConvertFromRootFrame(position).Y();
+                         ? ConvertPointFromRootFrame(position).X()
+                         : ConvertPointFromRootFrame(position).Y();
       *should_update_capture = true;
       return true;
     }
@@ -433,8 +433,8 @@ void Scrollbar::MouseMoved(const WebMouseEvent& evt) {
       }
     } else {
       MoveThumb(orientation_ == kHorizontalScrollbar
-                    ? ConvertFromRootFrame(position).X()
-                    : ConvertFromRootFrame(position).Y(),
+                    ? ConvertPointFromRootFrame(position).X()
+                    : ConvertPointFromRootFrame(position).Y(),
                 GetTheme().ShouldDragDocumentInsteadOfThumb(*this, evt));
     }
     return;
@@ -442,8 +442,8 @@ void Scrollbar::MouseMoved(const WebMouseEvent& evt) {
 
   if (pressed_part_ != kNoPart) {
     pressed_pos_ = Orientation() == kHorizontalScrollbar
-                       ? ConvertFromRootFrame(position).X()
-                       : ConvertFromRootFrame(position).Y();
+                       ? ConvertPointFromRootFrame(position).X()
+                       : ConvertPointFromRootFrame(position).Y();
   }
 
   ScrollbarPart part = GetTheme().HitTest(*this, position);
@@ -505,8 +505,8 @@ void Scrollbar::MouseDown(const WebMouseEvent& evt) {
   IntPoint position = FlooredIntPoint(evt.PositionInRootFrame());
   SetPressedPart(GetTheme().HitTest(*this, position));
   int pressed_pos = Orientation() == kHorizontalScrollbar
-                        ? ConvertFromRootFrame(position).X()
-                        : ConvertFromRootFrame(position).Y();
+                        ? ConvertPointFromRootFrame(position).X()
+                        : ConvertPointFromRootFrame(position).Y();
 
   if ((pressed_part_ == kBackTrackPart || pressed_part_ == kForwardTrackPart) &&
       GetTheme().ShouldCenterOnThumb(*this, evt)) {
@@ -574,10 +574,11 @@ bool Scrollbar::IsWindowActive() const {
   return scrollable_area_ && scrollable_area_->IsActive();
 }
 
-IntPoint Scrollbar::ConvertFromRootFrame(
+IntPoint Scrollbar::ConvertPointFromRootFrame(
     const IntPoint& point_in_root_frame) const {
-  if (const FrameViewBase* parent = Parent()) {
-    IntPoint parent_point = parent->ConvertFromRootFrame(point_in_root_frame);
+  if (const ScrollbarParent* parent = Parent()) {
+    IntPoint parent_point =
+        parent->ConvertPointFromRootFrame(point_in_root_frame);
     if (scrollable_area_) {
       return scrollable_area_->ConvertFromContainingFrameViewToScrollbar(
           *this, parent_point);