Rename FrameView fields and methods *Widget* to ...FrameViewBase...

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 139 matching lines @@
   int layoutCount() const { return m_layoutCount; }
 
   void countObjectsNeedingLayout(unsigned& needsLayoutObjects,
                                  unsigned& totalObjects,
                                  bool& isPartial);
 
   bool needsLayout() const;
   bool checkDoesNotNeedLayout() const;
   void setNeedsLayout();
 
-  void setNeedsUpdateWidgetGeometries() {
-    m_needsUpdateWidgetGeometries = true;
+  void setNeedsUpdateFrameViewBaseGeometries() {

[haraken, 2017/03/03 19:07:34]

This sounds a bit too verbose. setNeedsUpdateGeometries?

[joelhockey, 2017/03/05 22:37:42]

done

+    m_needsUpdateFrameViewBaseGeometries = true;
   }
 
   // Methods for getting/setting the size Blink should use to layout the
   // contents.
   // NOTE: Scrollbar exclusion is based on the FrameView's scrollbars. To
   // exclude scrollbars on the root PaintLayer, use LayoutView::layoutSize.
   IntSize layoutSize(IncludeScrollbarsInRect = ExcludeScrollbars) const;
   void setLayoutSize(const IntSize&);
 
   // If this is set to false, the layout size will need to be explicitly set by
@@ skipping 90 matching lines @@
   bool safeToPropagateScrollToParent() const {
     return m_safeToPropagateScrollToParent;
   }
   void setSafeToPropagateScrollToParent(bool isSafe) {
     m_safeToPropagateScrollToParent = isSafe;
   }
 
   void addPart(LayoutPart*);
   void removePart(LayoutPart*);
 
-  void updateWidgetGeometries();
+  void updateFrameViewBaseGeometries();

[haraken, 2017/03/03 19:07:34]

updateGeometries ?

[joelhockey, 2017/03/05 22:37:42]

done

 
   void addPartToUpdate(LayoutEmbeddedObject&);
 
   Color documentBackgroundColor() const;
 
   // Run all needed lifecycle stages. After calling this method, all frames will
   // be in the lifecycle state PaintInvalidationClean.  If lifecycle throttling
   // is allowed (see DocumentLifecycle::AllowThrottlingScope), some frames may
   // skip the lifecycle update (e.g., based on visibility) and will not end up
   // being PaintInvalidationClean.
@@ skipping 152 matching lines @@
   bool shouldScrollOnMainThread() const override;
   PaintLayer* layer() const override;
   GraphicsLayer* layerForScrolling() const override;
   GraphicsLayer* layerForHorizontalScrollbar() const override;
   GraphicsLayer* layerForVerticalScrollbar() const override;
   GraphicsLayer* layerForScrollCorner() const override;
   int scrollSize(ScrollbarOrientation) const override;
   bool isScrollCornerVisible() const override;
   bool userInputScrollable(ScrollbarOrientation) const override;
   bool shouldPlaceVerticalScrollbarOnLeft() const override;
-  FrameViewBase* getWidget() override;
+  FrameViewBase* getFrameViewBase() override;
   CompositorAnimationHost* compositorAnimationHost() const override;
   CompositorAnimationTimeline* compositorAnimationTimeline() const override;
   LayoutBox* layoutBox() const override;
   FloatQuad localToVisibleContentQuad(const FloatQuad&,
                                       const LayoutObject*,
                                       unsigned = 0) const final;
   RefPtr<WebTaskRunner> getTimerTaskRunner() const final;
 
   LayoutRect scrollIntoView(const LayoutRect& rectInContent,
                             const ScrollAlignment& alignX,
                             const ScrollAlignment& alignY,
                             ScrollType = ProgrammaticScroll) override;
 
   // The window that hosts the FrameView. The FrameView will communicate scrolls
   // and repaints to the host window in the window's coordinate space.
   HostWindow* getHostWindow() const;
 
-  typedef HeapHashSet<Member<FrameViewBase>> ChildrenWidgetSet;
+  typedef HeapHashSet<Member<FrameViewBase>> ChildrenFrameViewBaseSet;
 
   // Functions for child manipulation and inspection.
   void setParent(FrameViewBase*) override;
   void removeChild(FrameViewBase*);
   void addChild(FrameViewBase*);
-  const ChildrenWidgetSet* children() const { return &m_children; }
+  const ChildrenFrameViewBaseSet* children() const { return &m_children; }
 
   // If the scroll view does not use a native widget, then it will have
   // cross-platform Scrollbars. These functions can be used to obtain those
   // scrollbars.
   Scrollbar* horizontalScrollbar() const override {
     return m_scrollbarManager.horizontalScrollbar();
   }
   Scrollbar* verticalScrollbar() const override {
     return m_scrollbarManager.verticalScrollbar();
   }
@@ skipping 159 matching lines @@
   // 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 convertFromScrollbarToContainingWidget(const Scrollbar&,
-                                                 const IntRect&) const override;
-  IntRect convertFromContainingWidgetToScrollbar(const Scrollbar&,
-                                                 const IntRect&) const override;
-  IntPoint convertFromScrollbarToContainingWidget(
+  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 convertFromContainingWidgetToScrollbar(
+  IntPoint convertFromContainingFrameViewBaseToScrollbar(

[haraken, 2017/03/03 19:07:34]

Instead of renaming methods on a per-file basis, it might make more sense to
rename them on a per-functionality basis. e.g., you can rename all convert*
methods in one CL. Then you can rename all updateGeometry things in one CL etc.

[joelhockey, 2017/03/05 22:37:42]

Acknowledged.  I'll try and use the approach for other renames.  I went with the
per-file approach since I don't really know which per-functionality methods
exist and where they live.  At least with the per-file approach I can make sure
I get everything.  In the end, I figure that the renames will happen in very
quick succession and the code ends up in the same end-state.

       const Scrollbar&,
       const IntPoint&) const override;
 
   bool isFrameView() const override { return true; }
 
   DECLARE_VIRTUAL_TRACE();
   void notifyPageThatContentAreaWillPaint() const;
   FrameView* parentFrameView() const;
 
   // Returns the scrollable area for the frame. For the root frame, this will
@@ skipping 287 matching lines @@
 
   // 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;
 
   void didChangeGlobalRootScroller() override;
 
-  void updateWidgetGeometriesIfNeeded();
+  void updateFrameViewBaseGeometriesIfNeeded();
 
   bool wasViewportResized();
   void sendResizeEventIfNeeded();
 
   void updateParentScrollableAreaSet();
 
-  void scheduleUpdateWidgetsIfNecessary();
-  void updateWidgetsTimerFired(TimerBase*);
-  bool updateWidgets();
+  void scheduleUpdateFrameViewBasesIfNecessary();
+  void updateFrameViewBasesTimerFired(TimerBase*);
+  bool updateFrameViewBases();
 
   bool processUrlFragmentHelper(const String&, UrlFragmentBehavior);
   void setFragmentAnchor(Node*);
   void scrollToFragmentAnchor();
   void didScrollTimerFired(TimerBase*);
 
   void updateLayersAndCompositingAfterScrollIfNeeded();
 
   static bool computeCompositedSelection(LocalFrame&, CompositedSelection&);
   void updateCompositedSelectionIfNeeded();
@@ skipping 84 matching lines @@
 
   bool m_hasPendingLayout;
   LayoutSubtreeRootList m_layoutSubtreeRootList;
   DepthOrderedLayoutObjectList m_orthogonalWritingModeRootList;
 
   bool m_layoutSchedulingEnabled;
   bool m_inSynchronousPostLayout;
   int m_layoutCount;
   unsigned m_nestedLayoutCount;
   TaskRunnerTimer<FrameView> m_postLayoutTasksTimer;
-  TaskRunnerTimer<FrameView> m_updateWidgetsTimer;
+  TaskRunnerTimer<FrameView> m_updateFrameViewBasesTimer;
 
   bool m_firstLayout;
   bool m_isTransparent;
   Color m_baseBackgroundColor;
   IntSize m_lastViewportSize;
   float m_lastZoomFactor;
 
   AtomicString m_mediaType;
   AtomicString m_mediaTypeWhenNotPrinting;
 
@@ skipping 21 matching lines @@
   float m_inputEventsScaleFactorForEmulation;
 
   IntSize m_layoutSize;
   IntSize m_initialViewportSize;
   bool m_layoutSizeFixedToFrameSize;
 
   TaskRunnerTimer<FrameView> m_didScrollTimer;
 
   Vector<IntRect> m_tickmarks;
 
-  bool m_needsUpdateWidgetGeometries;
+  bool m_needsUpdateFrameViewBaseGeometries;
 
 #if DCHECK_IS_ON()
   // Verified when finalizing.
   bool m_hasBeenDisposed = false;
 #endif
 
   ScrollbarMode m_horizontalScrollbarMode;
   ScrollbarMode m_verticalScrollbarMode;
 
   bool m_horizontalScrollbarLock;
   bool m_verticalScrollbarLock;
 
-  ChildrenWidgetSet m_children;
+  ChildrenFrameViewBaseSet m_children;
 
   ScrollOffset m_pendingScrollDelta;
   ScrollOffset m_scrollOffset;
   IntSize m_contentsSize;
 
   bool m_scrollbarsSuppressed;
 
   bool m_inUpdateScrollbars;
 
   std::unique_ptr<LayoutAnalyzer> m_analyzer;
@@ skipping 116 matching lines @@
                   frameViewBase.isFrameView());
 DEFINE_TYPE_CASTS(FrameView,
                   ScrollableArea,
                   scrollableArea,
                   scrollableArea->isFrameView(),
                   scrollableArea.isFrameView());
 
 }  // namespace blink
 
 #endif  // FrameView_h