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

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

 /*
    Copyright (C) 1997 Martin Jones (mjones@kde.org)
              (C) 1998 Waldo Bastian (bastian@kde.org)
              (C) 1998, 1999 Torben Weis (weis@kde.org)
              (C) 1999 Lars Knoll (knoll@kde.org)
              (C) 1999 Antti Koivisto (koivisto@kde.org)
    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights
    reserved.
 
    This library is free software; you can redistribute it and/or
@@ skipping 606 matching lines @@
   FloatPoint FrameToContents(const FloatPoint&) const;
   IntRect FrameToContents(const IntRect&) const;
 
   // Functions for converting to screen coordinates.
   IntRect ContentsToScreen(const IntRect&) const;
 
   // For platforms that need to hit test scrollbars from within the engine's
   // event handlers (like Win32).
   Scrollbar* ScrollbarAtFramePoint(const IntPoint&);
 
-  IntPoint ConvertChildToSelf(const FrameViewBase* child,
-                              const IntPoint& point) const override {
-    IntPoint new_point = point;
-    if (!IsFrameViewScrollbar(child))
-      new_point = ContentsToFrame(point);
-    new_point.MoveBy(child->Location());
-    return new_point;
-  }
-
-  IntPoint ConvertSelfToChild(const FrameViewBase* child,
-                              const IntPoint& point) const override {
-    IntPoint new_point = point;
-    if (!IsFrameViewScrollbar(child))
-      new_point = FrameToContents(point);
-    new_point.MoveBy(-child->Location());
-    return new_point;
-  }
+  IntRect ConvertToRootFrame(const IntRect&) const;
+  IntPoint ConvertToRootFrame(const IntPoint&) const;
+  IntPoint ConvertSelfToChild(const FrameViewBase*, const IntPoint&) const;
 
   // FrameViewBase override. Handles painting of the contents of the view as
   // well as the scrollbars.
   void Paint(GraphicsContext&, const CullRect&) const override;
   void Paint(GraphicsContext&, const GlobalPaintFlags, const CullRect&) const;
   void PaintContents(GraphicsContext&,
                      const GlobalPaintFlags,
                      const IntRect& damage_rect) const;
 
   // FrameViewBase overrides to ensure that our children's visibility status is
   // kept up to date when we get shown and hidden.
   void Show() override;
   void Hide() override;
   void SetParentVisible(bool) override;
 
   bool IsPointInScrollbarCorner(const IntPoint&);
   bool ScrollbarCornerPresent() const;
   IntRect ScrollCornerRect() const override;
 
-  IntRect ConvertFromScrollbarToContainingFrameViewBase(
-      const Scrollbar&,
-      const IntRect&) const override;
-  IntRect ConvertFromContainingFrameViewBaseToScrollbar(
-      const Scrollbar&,
-      const IntRect&) const override;
-  IntPoint ConvertFromScrollbarToContainingFrameViewBase(
-      const Scrollbar&,
-      const IntPoint&) const override;
   IntPoint ConvertFromContainingFrameViewBaseToScrollbar(
       const Scrollbar&,
       const IntPoint&) const override;
 
   bool IsFrameView() const override { return true; }
 
   DECLARE_VIRTUAL_TRACE();
   void NotifyPageThatContentAreaWillPaint() const;
   FrameView* ParentFrameView() const;
 
@@ skipping 280 matching lines @@
   void ScheduleOrPerformPostLayoutTasks();
   void PerformPostLayoutTasks();
 
   void RecordDeferredLoadingStats();
 
   DocumentLifecycle& Lifecycle() const;
 
   void ContentsResized() override;
   void ScrollbarExistenceDidChange();
 
-  // Override FrameViewBase methods to do point conversion via layoutObjects, in
-  // order to take transforms into account.
-  IntRect ConvertToContainingFrameViewBase(const IntRect&) const override;
-  IntRect ConvertFromContainingFrameViewBase(const IntRect&) const override;
-  IntPoint ConvertToContainingFrameViewBase(const IntPoint&) const override;
-  IntPoint ConvertFromContainingFrameViewBase(const IntPoint&) const override;
+  // Methods to do point conversion via layoutObjects, in order to take
+  // transforms into account.
+  IntRect ConvertToContainingFrameViewBase(const IntRect&) const;
+  IntPoint ConvertToContainingFrameViewBase(const IntPoint&) const;
+  IntRect ConvertFromContainingFrameViewBase(const IntRect&) const;
+  IntPoint ConvertFromContainingFrameViewBase(const IntPoint&) const;
 
   void DidChangeGlobalRootScroller() override;
 
   void UpdateGeometriesIfNeeded();
 
   bool WasViewportResized();
   void SendResizeEventIfNeeded();
 
   void UpdateParentScrollableAreaSet();
 
@@ skipping 283 matching lines @@
                   frameViewBase.IsFrameView());
 DEFINE_TYPE_CASTS(FrameView,
                   ScrollableArea,
                   scrollableArea,
                   scrollableArea->IsFrameView(),
                   scrollableArea.IsFrameView());
 
 }  // namespace blink
 
 #endif  // FrameView_h