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

third_party/WebKit/Source/platform/FrameViewBase.h

 /*
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008 Collabora Ltd.  All rights reserved.
  * Copyright (C) 2013 Google 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.
@@ skipping 71 matching lines @@
   virtual bool IsPluginView() const { return false; }
   virtual bool IsPluginContainer() const { return false; }
   virtual bool IsScrollbar() const { return false; }
 
   virtual void SetParent(FrameViewBase*);
   FrameViewBase* Parent() const { return parent_; }
   FrameViewBase* Root() const;
 
   virtual void HandleEvent(Event*) {}
 
-  IntRect ConvertToRootFrame(const IntRect&) const;
+  // ConvertFromRootFrame must be in FrameViewBase rather than FrameView
+  // to be visible to Scrollbar::ConvertFromRootFrame and
+  // RemoteFrameView::UpdateRemoteViewportIntersection. The related
+  // ConvertFromContainingFrameViewBase must be declared locally to be visible.
   IntRect ConvertFromRootFrame(const IntRect&) const;
-
-  IntPoint ConvertToRootFrame(const IntPoint&) const;
   IntPoint ConvertFromRootFrame(const IntPoint&) const;
   FloatPoint ConvertFromRootFrame(const FloatPoint&) const;
+  // TODO(joelhockey): Change all these to pure virtual functions
+  // Once RemoteFrameView no longer inherits from FrameViewBase.
+  virtual IntRect ConvertFromContainingFrameViewBase(
+      const IntRect& parent_rect) const {
+    NOTREACHED();
+    return parent_rect;
+  }
+  virtual IntPoint ConvertFromContainingFrameViewBase(
+      const IntPoint& parent_point) const {
+    NOTREACHED();
+    return parent_point;
+  }
 
   virtual void FrameRectsChanged() {}
 
   virtual void GeometryMayHaveChanged() {}
 
-  virtual IntRect ConvertToContainingFrameViewBase(const IntRect&) const;
-  virtual IntRect ConvertFromContainingFrameViewBase(const IntRect&) const;
-  virtual IntPoint ConvertToContainingFrameViewBase(const IntPoint&) const;
-  virtual IntPoint ConvertFromContainingFrameViewBase(const IntPoint&) const;
-
-  // Virtual methods to convert points to/from child frameviewbases.
-  virtual IntPoint ConvertChildToSelf(const FrameViewBase*,
-                                      const IntPoint&) const;
-  virtual IntPoint ConvertSelfToChild(const FrameViewBase*,
-                                      const IntPoint&) const;
-
   // Notifies this frameviewbase that it will no longer be receiving events.
   virtual void EventListenersRemoved() {}
 
   DECLARE_VIRTUAL_TRACE();
   virtual void Dispose() {}
 
  private:
   Member<FrameViewBase> parent_;
   IntRect frame_rect_;
   bool self_visible_;
   bool parent_visible_;
 };
 
 }  // namespace blink
 
 #endif  // FrameViewBase_h