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

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

 /*
  * Copyright (C) 2008, 2011 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 166 matching lines @@
   virtual IntRect ScrollCornerRect() const = 0;
   void SetScrollCornerNeedsPaintInvalidation();
   virtual void GetTickmarks(Vector<IntRect>&) const {}
 
   // Convert points and rects between the scrollbar and its containing
   // FrameViewBase. The client needs to implement these in order to be aware of
   // layout effects like CSS transforms.
   virtual IntRect ConvertFromScrollbarToContainingFrameViewBase(
       const Scrollbar& scrollbar,
       const IntRect& scrollbar_rect) const {
-    return scrollbar.FrameViewBase::ConvertToContainingFrameViewBase(
-        scrollbar_rect);
+    IntRect local_rect = scrollbar_rect;
+    local_rect.MoveBy(scrollbar.Location());
+    return local_rect;
   }
-  virtual IntRect ConvertFromContainingFrameViewBaseToScrollbar(
+  virtual IntPoint ConvertFromContainingFrameViewBaseToScrollbar(
       const Scrollbar& scrollbar,
-      const IntRect& parent_rect) const {
-    return scrollbar.FrameViewBase::ConvertFromContainingFrameViewBase(
-        parent_rect);
+      const IntPoint& parent_point) const {
+    NOTREACHED();
+    return parent_point;
   }
   virtual IntPoint ConvertFromScrollbarToContainingFrameViewBase(
       const Scrollbar& scrollbar,
       const IntPoint& scrollbar_point) const {
-    return scrollbar.FrameViewBase::ConvertToContainingFrameViewBase(
-        scrollbar_point);
+    NOTREACHED();
+    return scrollbar_point;
   }
-  virtual IntPoint ConvertFromContainingFrameViewBaseToScrollbar(
-      const Scrollbar& scrollbar,
-      const IntPoint& parent_point) const {
-    return scrollbar.FrameViewBase::ConvertFromContainingFrameViewBase(
-        parent_point);
-  }
-
   virtual Scrollbar* HorizontalScrollbar() const { return nullptr; }
   virtual Scrollbar* VerticalScrollbar() const { return nullptr; }
 
   virtual PaintLayer* Layer() const { return nullptr; }
 
   // scrollPosition is the location of the top/left of the scroll viewport in
   // the coordinate system defined by the top/left of the overflow rect.
   // scrollOffset is the offset of the scroll viewport from its position when
   // scrolled all the way to the beginning of its content's flow.
   // For a more detailed explanation of scrollPosition, scrollOffset, and
@@ skipping 237 matching lines @@
   // vertical-lr / ltr            NO                      NO
   // vertical-lr / rtl            NO                      YES
   // vertical-rl / ltr            YES                     NO
   // vertical-rl / rtl            YES                     YES
   IntPoint scroll_origin_;
 };
 
 }  // namespace blink
 
 #endif  // ScrollableArea_h