Remove unneeded Convert* methods and move many from FrameViewBase to FrameView

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

 /*
  * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 551 matching lines @@
   // Non-overlay scrollbars should always participate in hit testing.
   if (!IsOverlayScrollbar())
     return true;
   return !scrollable_area_->ScrollbarsHidden();
 }
 
 bool Scrollbar::IsWindowActive() const {
   return scrollable_area_ && scrollable_area_->IsActive();
 }
 
+IntPoint Scrollbar::ConvertFromRootFrame(
+    const IntPoint& point_in_root_frame) const {
+  if (const FrameViewBase* parent = Parent()) {
+    IntPoint parent_point = parent->ConvertFromRootFrame(point_in_root_frame);
+    if (scrollable_area_) {
+      return scrollable_area_->ConvertFromContainingFrameViewBaseToScrollbar(
+          *this, parent_point);
+    }
+  }
+
+  return point_in_root_frame;
+}
+
 IntRect Scrollbar::ConvertToContainingFrameViewBase(
     const IntRect& local_rect) const {
   if (scrollable_area_) {
     return scrollable_area_->ConvertFromScrollbarToContainingFrameViewBase(
         *this, local_rect);
   }
 
-  return FrameViewBase::ConvertToContainingFrameViewBase(local_rect);
-}
-
-IntRect Scrollbar::ConvertFromContainingFrameViewBase(
-    const IntRect& parent_rect) const {
-  if (scrollable_area_) {
-    return scrollable_area_->ConvertFromContainingFrameViewBaseToScrollbar(
-        *this, parent_rect);
-  }
-
-  return FrameViewBase::ConvertFromContainingFrameViewBase(parent_rect);
-}
-
-IntPoint Scrollbar::ConvertToContainingFrameViewBase(
-    const IntPoint& local_point) const {
-  if (scrollable_area_) {
-    return scrollable_area_->ConvertFromScrollbarToContainingFrameViewBase(
-        *this, local_point);
-  }
-
-  return FrameViewBase::ConvertToContainingFrameViewBase(local_point);
+  return local_rect;
 }
 
 IntPoint Scrollbar::ConvertFromContainingFrameViewBase(
     const IntPoint& parent_point) const {
   if (scrollable_area_) {
     return scrollable_area_->ConvertFromContainingFrameViewBaseToScrollbar(
         *this, parent_point);
   }
 
-  return FrameViewBase::ConvertFromContainingFrameViewBase(parent_point);
+  return parent_point;
 }
 
 float Scrollbar::ScrollableAreaCurrentPos() const {
   if (!scrollable_area_)
     return 0;
 
   if (orientation_ == kHorizontalScrollbar) {
     return scrollable_area_->GetScrollOffset().Width() -
            scrollable_area_->MinimumScrollOffset().Width();
   }
@@ skipping 20 matching lines @@
     invalid_parts = kAllParts;
   if (invalid_parts & ~kThumbPart)
     track_needs_repaint_ = true;
   if (invalid_parts & kThumbPart)
     thumb_needs_repaint_ = true;
   if (scrollable_area_)
     scrollable_area_->SetScrollbarNeedsPaintInvalidation(Orientation());
 }
 
 }  // namespace blink