Merge LocalFrameView::layoutOrVisualViewportChanged into LocalFrameVi…

…ew::updateLayoutViewport https://bugs.webkit.org/show_bug.cgi?id=256355 Reviewed by NOBODY (OOPS!). Merged LocalFrameView::layoutOrVisualViewportChanged into LocalFrameView::updateLayoutViewport. * Source/WebCore/page/LocalFrameView.cpp: (WebCore::LocalFrameView::updateLayoutViewport): (WebCore::LocalFrameView::layoutOrVisualViewportChanged): Deleted. * Source/WebCore/page/LocalFrameView.h:
WebKit · May 5, 2023 · 7b1c4ea · 7b1c4ea
1 parent ec43790
commit 7b1c4ea
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/Source/WebCore/page/LocalFrameView.cpp b/Source/WebCore/page/LocalFrameView.cpp
@@ -1827,16 +1827,20 @@ void LocalFrameView::updateLayoutViewport()
             LayoutPoint newOrigin = computeLayoutViewportOrigin(visualViewportRect(), minStableLayoutViewportOrigin(), maxStableLayoutViewportOrigin(), layoutViewport, StickToDocumentBounds);
             setLayoutViewportOverrideRect(LayoutRect(newOrigin, m_layoutViewportOverrideRect.value().size()));
         }
-        layoutOrVisualViewportChanged();
-        return;
+    } else {
+        LayoutPoint newLayoutViewportOrigin = computeLayoutViewportOrigin(visualViewportRect(), minStableLayoutViewportOrigin(), maxStableLayoutViewportOrigin(), layoutViewport, scrollBehaviorForFixedElements());
+        if (newLayoutViewportOrigin != m_layoutViewportOrigin) {
+            setBaseLayoutViewportOrigin(newLayoutViewportOrigin);
+            LOG_WITH_STREAM(Scrolling, stream << "layoutViewport changed to " << layoutViewportRect());
+        }
     }
+    if (m_frame->settings().visualViewportAPIEnabled()) {
+        if (auto* window = m_frame->window())
+            window->visualViewport().update();
 
-    LayoutPoint newLayoutViewportOrigin = computeLayoutViewportOrigin(visualViewportRect(), minStableLayoutViewportOrigin(), maxStableLayoutViewportOrigin(), layoutViewport, scrollBehaviorForFixedElements());
-    if (newLayoutViewportOrigin != m_layoutViewportOrigin) {
-        setBaseLayoutViewportOrigin(newLayoutViewportOrigin);
-        LOG_WITH_STREAM(Scrolling, stream << "layoutViewport changed to " << layoutViewportRect());
+        if (auto scrollingCoordinator = this->scrollingCoordinator())
+            scrollingCoordinator->frameViewVisualViewportChanged(*this);
     }
-    layoutOrVisualViewportChanged();
 }
 
 LayoutPoint LocalFrameView::minStableLayoutViewportOrigin() const
@@ -3284,18 +3288,6 @@ void LocalFrameView::updateTiledBackingAdaptiveSizing()
     tiledBacking->setScrollability(computeScrollability());
 }
 
-// FIXME: This shouldn't be called from outside; LocalFrameView should call it when the relevant viewports change.
-void LocalFrameView::layoutOrVisualViewportChanged()
-{
-    if (m_frame->settings().visualViewportAPIEnabled()) {
-        if (auto* window = m_frame->window())
-            window->visualViewport().update();
-
-        if (auto scrollingCoordinator = this->scrollingCoordinator())
-            scrollingCoordinator->frameViewVisualViewportChanged(*this);
-    }
-}
-
 void LocalFrameView::unobscuredContentSizeChanged()
 {
 #if PLATFORM(IOS_FAMILY)

diff --git a/Source/WebCore/page/LocalFrameView.h b/Source/WebCore/page/LocalFrameView.h
@@ -328,8 +328,6 @@ class LocalFrameView final : public FrameView {
     // offsets from rubber-banding, and it takes zooming into account. 
     LayoutRect viewportConstrainedVisibleContentRect() const;
 
-    WEBCORE_EXPORT void layoutOrVisualViewportChanged();
-
     LayoutRect rectForFixedPositionLayout() const;
 
     void viewportContentsChanged();