Audited and renamed uses of methods and variables named RootView

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
    modify it under the terms of the GNU Library General Public
@@ skipping 225 matching lines @@
     void incrementVisuallyNonEmptyPixelCount(const IntSize&);
     void setIsVisuallyNonEmpty() { m_isVisuallyNonEmpty = true; }
     void enableAutoSizeMode(const IntSize& minSize, const IntSize& maxSize);
     void disableAutoSizeMode() { disposeAutoSizeInfo(); }
 
     void forceLayoutForPagination(const FloatSize& pageSize, const FloatSize& originalPageSize, float maximumShrinkFactor);
 
     bool scrollToFragment(const KURL&);
     bool scrollToAnchor(const String&);
     void maintainScrollPositionAtAnchor(Node*);
+
     void scrollElementToRect(Element*, const IntRect&);
     void scrollContentsIfNeededRecursive();
 
     // Methods to convert points and rects between the coordinate space of the renderer, and this view.
     IntRect convertFromRenderer(const LayoutObject&, const IntRect&) const;
     IntRect convertToRenderer(const LayoutObject&, const IntRect&) const;
     IntPoint convertFromRenderer(const LayoutObject&, const IntPoint&) const;
     IntPoint convertToRenderer(const LayoutObject&, const IntPoint&) const;
 
     bool isFrameViewScrollCorner(RenderScrollbarPart* scrollCorner) const { return m_scrollCorner == scrollCorner; }
@@ skipping 203 matching lines @@
 
     // Scroll the actual contents of the view (either blitting or invalidating as needed).
     void scrollContents(const IntSize& scrollDelta);
 
     // This gives us a means of blocking painting on our scrollbars until the first layout has occurred.
     void setScrollbarsSuppressed(bool suppressed, bool repaintOnUnsuppress = false);
     bool scrollbarsSuppressed() const { return m_scrollbarsSuppressed; }
 
     bool drawPanScrollIcon() { return m_shouldDrawPanScrollIcon; }
 
-    IntPoint rootViewToContents(const IntPoint&) const;
-    IntPoint contentsToRootView(const IntPoint&) const;
-    IntRect rootViewToContents(const IntRect&) const;
-    IntRect contentsToRootView(const IntRect&) const;
+    IntPoint rootFrameToContents(const IntPoint&) const;
+    IntRect rootFrameToContents(const IntRect&) const;
+    IntPoint contentsToRootFrame(const IntPoint&) const;
+    IntRect contentsToRootFrame(const IntRect&) const;
 
     // Event coordinates are assumed to be in the coordinate space of a window that contains
     // the entire widget hierarchy. It is up to the platform to decide what the precise definition
     // of containing window is. (For example on Mac it is the containing NSWindow.)
     IntPoint windowToContents(const IntPoint&) const;
     FloatPoint windowToContents(const FloatPoint&) const;
     IntPoint contentsToWindow(const IntPoint&) const;
     IntRect windowToContents(const IntRect&) const;
     IntRect contentsToWindow(const IntRect&) const;
 
+    // Methods for converting between Frame and Content (i.e. Document) coordinates.
+    // Frame coordinates are relative to the top left corner of the frame and so
+    // they are affected by scroll offset. Content coordinates are relative to the
+    // document's top left corner and thus are not affected by scroll offset.
+    IntPoint contentsToFrame(const IntPoint&) const;
+    IntRect contentsToFrame(const IntRect&) const;
+    IntPoint frameToContents(const IntPoint&) const;
+    FloatPoint frameToContents(const FloatPoint&) const;
+    IntRect frameToContents(const IntRect&) const;
+
     // Functions for converting to screen coordinates.
     IntRect contentsToScreen(const IntRect&) const;
 
     // These functions are used to enable scrollbars to avoid window resizer controls that overlap the scroll view.
     // This happens only on Mac OS X 10.6.
     IntRect windowResizerRect() const;
     bool containsScrollbarsAvoidingResizer() const;
     void adjustScrollbarsAvoidingResizerCount(int overlapDelta);
     void windowResizerRectChanged();
 
     // For platforms that need to hit test scrollbars from within the engine's event handlers (like Win32).
-    Scrollbar* scrollbarAtWindowPoint(const IntPoint& windowPoint);
-    Scrollbar* scrollbarAtViewPoint(const IntPoint& viewPoint);
+    Scrollbar* scrollbarAtWindowPoint(const IntPoint&);
+    Scrollbar* scrollbarAtFramePoint(const IntPoint&);
 
     virtual IntPoint convertChildToSelf(const Widget* child, const IntPoint& point) const override
     {
         IntPoint newPoint = point;
         if (!isFrameViewScrollbar(child))
-            newPoint = point - scrollOffset();
+            newPoint = contentsToFrame(point);
         newPoint.moveBy(child->location());
         return newPoint;
     }
 
     virtual IntPoint convertSelfToChild(const Widget* child, const IntPoint& point) const override
     {
         IntPoint newPoint = point;
         if (!isFrameViewScrollbar(child))
-            newPoint = point + scrollOffset();
+            newPoint = frameToContents(point);
         newPoint.moveBy(-child->location());
         return newPoint;
     }
 
     // Widget override. Handles painting of the contents of the view as well as the scrollbars.
     virtual void paint(GraphicsContext*, const IntRect&) override;
     void paintContents(GraphicsContext*, const IntRect& damageRect);
 
     // Widget overrides to ensure that our children's visibility status is kept up to date when we get shown and hidden.
     virtual void show() override;
@@ skipping 223 matching lines @@
     bool m_verticalOverflow;
     LayoutObject* m_viewportRenderer;
 
     bool m_wasScrolledByUser;
     bool m_inProgrammaticScroll;
     bool m_safeToPropagateScrollToParent;
 
     double m_lastPaintTime;
 
     bool m_isTrackingPaintInvalidations; // Used for testing.
+
+    // In frame coordinates.
     Vector<IntRect> m_trackedPaintInvalidationRects;
 
     RefPtrWillBeMember<Node> m_nodeToDraw;
     PaintBehavior m_paintBehavior;
     bool m_isPainting;
 
     unsigned m_visuallyNonEmptyCharacterCount;
     unsigned m_visuallyNonEmptyPixelCount;
     bool m_isVisuallyNonEmpty;
     bool m_firstVisuallyNonEmptyLayoutCallbackPending;
@@ skipping 80 matching lines @@
     static const unsigned visualPixelThreshold = 32 * 32;
     if (m_visuallyNonEmptyPixelCount > visualPixelThreshold)
         setIsVisuallyNonEmpty();
 }
 
 DEFINE_TYPE_CASTS(FrameView, Widget, widget, widget->isFrameView(), widget.isFrameView());
 
 } // namespace blink
 
 #endif // FrameView_h