| Index: third_party/WebKit/Source/core/frame/FrameView.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| index b70b61105eceb4957c8cb06e00abdc7d45830ecc..fb07362ec796570eb368d2a4ab36c7bc87ecac47 100644
|
| --- a/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
|
| @@ -823,7 +823,7 @@ void FrameView::performPreLayoutTasks()
|
| if (!m_scrollAnchor.hasScroller())
|
| m_scrollAnchor.setScroller(m_viewportScrollableArea ? m_viewportScrollableArea : this);
|
|
|
| - if (RuntimeEnabledFeatures::scrollAnchoringEnabled())
|
| + if (shouldPerformScrollAnchoring())
|
| m_scrollAnchor.save();
|
| }
|
|
|
| @@ -2122,7 +2122,7 @@ void FrameView::performPostLayoutTasks()
|
|
|
| scrollToFragmentAnchor();
|
| // TODO(skobes): Figure out interactions between scroll anchor, fragment anchor, and history restoration.
|
| - if (RuntimeEnabledFeatures::scrollAnchoringEnabled())
|
| + if (shouldPerformScrollAnchoring())
|
| m_scrollAnchor.restore();
|
|
|
| sendResizeEventIfNeeded();
|
| @@ -4097,7 +4097,7 @@ ScrollableArea* FrameView::layoutViewportScrollableArea()
|
| return layoutViewItem.isNull() ? nullptr : layoutViewItem.getScrollableArea();
|
| }
|
|
|
| -LayoutObject* FrameView::viewportLayoutObject()
|
| +LayoutObject* FrameView::viewportLayoutObject() const
|
| {
|
| if (Document* document = frame().document()) {
|
| if (Element* element = document->viewportDefiningElement())
|
|
|