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

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

Index: third_party/WebKit/Source/core/frame/FrameView.h
diff --git a/third_party/WebKit/Source/core/frame/FrameView.h b/third_party/WebKit/Source/core/frame/FrameView.h
index fb96df8cb45c03d11b98cc8be85c1c0928340211..680141d225b977efa1456cd74ab7b8bdfa5a7070 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.h
+++ b/third_party/WebKit/Source/core/frame/FrameView.h
@@ -157,8 +157,8 @@ class CORE_EXPORT FrameView final
   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
@@ -269,7 +269,7 @@ class CORE_EXPORT FrameView final
   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&);
 
@@ -442,7 +442,7 @@ class CORE_EXPORT FrameView final
   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;
@@ -460,13 +460,13 @@ class CORE_EXPORT FrameView final
   // 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
@@ -646,14 +646,16 @@ class CORE_EXPORT FrameView final
   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;
 
@@ -961,16 +963,16 @@ class CORE_EXPORT FrameView final
 
   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*);
@@ -1075,7 +1077,7 @@ class CORE_EXPORT FrameView final
   int m_layoutCount;
   unsigned m_nestedLayoutCount;
   TaskRunnerTimer<FrameView> m_postLayoutTasksTimer;
-  TaskRunnerTimer<FrameView> m_updateWidgetsTimer;
+  TaskRunnerTimer<FrameView> m_updateFrameViewBasesTimer;
 
   bool m_firstLayout;
   bool m_isTransparent;
@@ -1117,7 +1119,7 @@ class CORE_EXPORT FrameView final
 
   Vector<IntRect> m_tickmarks;
 
-  bool m_needsUpdateWidgetGeometries;
+  bool m_needsUpdateFrameViewBaseGeometries;
 
 #if DCHECK_IS_ON()
   // Verified when finalizing.
@@ -1130,7 +1132,7 @@ class CORE_EXPORT FrameView final
   bool m_horizontalScrollbarLock;
   bool m_verticalScrollbarLock;
 
-  ChildrenWidgetSet m_children;
+  ChildrenFrameViewBaseSet m_children;
 
   ScrollOffset m_pendingScrollDelta;
   ScrollOffset m_scrollOffset;