| 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 778f2a3f3df0ff190ffb7aa35031e8fe2cbdfd05..fb7129318e1aecf0bac52003edd6583619336082 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.h
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.h
|
| @@ -157,9 +157,7 @@ class CORE_EXPORT FrameView final
|
| bool checkDoesNotNeedLayout() const;
|
| void setNeedsLayout();
|
|
|
| - void setNeedsUpdateWidgetGeometries() {
|
| - m_needsUpdateWidgetGeometries = true;
|
| - }
|
| + void setNeedsUpdateGeometries() { m_needsUpdateGeometries = true; }
|
|
|
| // Methods for getting/setting the size Blink should use to layout the
|
| // contents.
|
| @@ -269,7 +267,7 @@ class CORE_EXPORT FrameView final
|
| void addPart(LayoutPart*);
|
| void removePart(LayoutPart*);
|
|
|
| - void updateWidgetGeometries();
|
| + void updateGeometries();
|
|
|
| void addPartToUpdate(LayoutEmbeddedObject&);
|
|
|
| @@ -460,13 +458,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
|
| @@ -963,16 +961,16 @@ class CORE_EXPORT FrameView final
|
|
|
| void didChangeGlobalRootScroller() override;
|
|
|
| - void updateWidgetGeometriesIfNeeded();
|
| + void updateGeometriesIfNeeded();
|
|
|
| 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*);
|
| @@ -1077,7 +1075,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;
|
| @@ -1119,7 +1117,7 @@ class CORE_EXPORT FrameView final
|
|
|
| Vector<IntRect> m_tickmarks;
|
|
|
| - bool m_needsUpdateWidgetGeometries;
|
| + bool m_needsUpdateGeometries;
|
|
|
| #if DCHECK_IS_ON()
|
| // Verified when finalizing.
|
| @@ -1132,7 +1130,7 @@ class CORE_EXPORT FrameView final
|
| bool m_horizontalScrollbarLock;
|
| bool m_verticalScrollbarLock;
|
|
|
| - ChildrenWidgetSet m_children;
|
| + ChildrenFrameViewBaseSet m_children;
|
|
|
| ScrollOffset m_pendingScrollDelta;
|
| ScrollOffset m_scrollOffset;
|
|
|