WebKit Bugzilla
Attachment 362693 Details for
Bug 194928
: Hardcode Visual Viewports on everywhere except iOS WK1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-194928-20190221211448.patch (text/plain), 142.71 KB, created by
Simon Fraser (smfr)
on 2019-02-21 21:14:49 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Simon Fraser (smfr)
Created:
2019-02-21 21:14:49 PST
Size:
142.71 KB
patch
obsolete
>Subversion Revision: 241857 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 7ceda86a60833be07d11a4fa8e2573690851d649..bbe79f0a3aa66d7c5badadc96ace913aa9194def 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,44 @@ >+2019-02-21 Simon Fraser <simon.fraser@apple.com> >+ >+ Hardcode Visual Viewports on everywhere except iOS WK1 >+ https://bugs.webkit.org/show_bug.cgi?id=194928 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Remove the WK1 and WK2 preferences and MiniBrowser menu item for "visual viewports", >+ change the default value of the Setting to 'true', and hardcode WebView on iOS to >+ set it to false. The setting has shipped for several years and there's no need to turn >+ it off now. >+ >+ Similarly, disable the "Visual Viewport API" on iOS WK1, since it makes no sense if >+ Visual Viewports are not enabled. >+ >+ Remove the "visualViewportEnabled" flag and unused code paths from scrolling tree code >+ that only runs in WK2 >+ >+ * page/Settings.yaml: >+ * page/scrolling/AsyncScrollingCoordinator.cpp: >+ (WebCore::AsyncScrollingCoordinator::frameViewLayoutUpdated): >+ (WebCore::AsyncScrollingCoordinator::reconcileScrollingState): >+ (WebCore::AsyncScrollingCoordinator::visualViewportEnabled const): Deleted. >+ * page/scrolling/AsyncScrollingCoordinator.h: >+ * page/scrolling/ScrollingStateFrameScrollingNode.cpp: >+ (WebCore::ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode): >+ (WebCore::ScrollingStateFrameScrollingNode::setAllPropertiesChanged): >+ (WebCore::ScrollingStateFrameScrollingNode::dumpProperties const): >+ (WebCore::ScrollingStateFrameScrollingNode::setVisualViewportEnabled): Deleted. >+ * page/scrolling/ScrollingStateFrameScrollingNode.h: >+ * page/scrolling/ScrollingTree.cpp: >+ (WebCore::ScrollingTree::commitTreeState): >+ * page/scrolling/ScrollingTree.h: >+ (WebCore::ScrollingTree::visualViewportEnabled const): Deleted. >+ (WebCore::ScrollingTree::setVisualViewportEnabled): Deleted. >+ * page/scrolling/ScrollingTreeFrameScrollingNode.cpp: >+ (WebCore::ScrollingTreeFrameScrollingNode::layoutViewportForScrollPosition const): >+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm: >+ (WebCore::ScrollingTreeFrameScrollingNodeMac::setScrollPositionWithoutContentEdgeConstraints): >+ (WebCore::ScrollingTreeFrameScrollingNodeMac::setScrollLayerPosition): >+ > 2019-02-20 Dean Jackson <dino@apple.com> > > Rotation animations sometimes use the wrong origin (affects apple.com) >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index a643abd0c9fc36cbdfb21bf4709157ec1264ac05..83b4ffa75f1ae5d06e6980551d3f478b51ec2053 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,49 @@ >+2019-02-21 Simon Fraser <simon.fraser@apple.com> >+ >+ Hardcode Visual Viewports on everywhere except iOS WK1 >+ https://bugs.webkit.org/show_bug.cgi?id=194928 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Remove the WK1 and WK2 preferences and MiniBrowser menu item for "visual viewports", >+ change the default value of the Setting to 'true', and hardcode WebView on iOS to >+ set it to false. The setting has shipped for several years and there's no need to turn >+ it off now. >+ >+ Similarly, disable the "Visual Viewport API" on iOS WK1, since it makes no sense if >+ Visual Viewports are not enabled. >+ >+ Remove the "visualViewportEnabled" flag and unused code paths from scrolling tree code >+ that only runs in WK2 >+ >+ * Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp: >+ (ArgumentCoder<ScrollingStateFrameScrollingNode>::encode): >+ (ArgumentCoder<ScrollingStateFrameScrollingNode>::decode): >+ * Shared/WebPreferences.yaml: >+ * UIProcess/API/Cocoa/WKPreferences.mm: >+ (-[WKPreferences _visualViewportEnabled]): Deleted. >+ (-[WKPreferences _setVisualViewportEnabled:]): Deleted. >+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h: >+ * UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm: >+ (WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree): >+ * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h: >+ (WebKit::RemoteScrollingCoordinatorProxy::visualViewportEnabled const): Deleted. >+ * UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm: >+ (WebKit::RemoteScrollingCoordinatorProxy::customFixedPositionRect const): >+ * UIProcess/WebPageProxy.h: >+ * UIProcess/ios/WKContentView.mm: >+ (-[WKContentView didUpdateVisibleRect:unobscuredRect:contentInsets:unobscuredRectInScrollViewCoordinates:obscuredInsets:unobscuredSafeAreaInsets:inputViewBounds:scale:minimumScale:inStableState:isChangingObscuredInsetsInteractively:enclosedInScrollableAncestorView:]): >+ * UIProcess/ios/WebPageProxyIOS.mm: >+ (WebKit::WebPageProxy::computeCustomFixedPositionRect const): >+ * WebProcess/Automation/WebAutomationSessionProxy.cpp: >+ (WebKit::WebAutomationSessionProxy::computeElementLayout): >+ * WebProcess/InjectedBundle/InjectedBundle.cpp: >+ (WebKit::InjectedBundle::overrideBoolPreferenceForTestRunner): >+ * WebProcess/WebPage/ios/WebPageIOS.mm: >+ (WebKit::WebPage::getFocusedElementInformation): >+ (WebKit::WebPage::dynamicViewportSizeUpdate): >+ (WebKit::WebPage::updateVisibleContentRects): >+ > 2019-02-20 Chris Dumez <cdumez@apple.com> > > [PSON] Make sure hung processes are not kept alive by suspended pages or process caching >diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog >index d4132c3cde8cf1d4f64166f90bbe909fcc7ab199..211dafa81170f25d24dc27f5d55d300a30af96eb 100644 >--- a/Source/WebKitLegacy/mac/ChangeLog >+++ b/Source/WebKitLegacy/mac/ChangeLog >@@ -1,3 +1,30 @@ >+2019-02-21 Simon Fraser <simon.fraser@apple.com> >+ >+ Hardcode Visual Viewports on everywhere except iOS WK1 >+ https://bugs.webkit.org/show_bug.cgi?id=194928 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Remove the WK1 and WK2 preferences and MiniBrowser menu item for "visual viewports", >+ change the default value of the Setting to 'true', and hardcode WebView on iOS to >+ set it to false. The setting has shipped for several years and there's no need to turn >+ it off now. >+ >+ Similarly, disable the "Visual Viewport API" on iOS WK1, since it makes no sense if >+ Visual Viewports are not enabled. >+ >+ Remove the "visualViewportEnabled" flag and unused code paths from scrolling tree code >+ that only runs in WK2 >+ >+ * WebView/WebPreferenceKeysPrivate.h: >+ * WebView/WebPreferences.mm: >+ (+[WebPreferences initialize]): >+ (-[WebPreferences visualViewportEnabled]): Deleted. >+ (-[WebPreferences setVisualViewportEnabled:]): Deleted. >+ * WebView/WebPreferencesPrivate.h: >+ * WebView/WebView.mm: >+ (-[WebView _preferencesChanged:]): >+ > 2019-02-18 Wenson Hsieh <wenson_hsieh@apple.com> > > [iOS] Support pasting item-provider-backed data on the pasteboard as attachment elements >diff --git a/Source/WebCore/page/Settings.yaml b/Source/WebCore/page/Settings.yaml >index 54585beb664dd11980692e95195a0c203fc2f173..303d7f82d4b37fdba1b7f2dd4a8da257e8ab977c 100644 >--- a/Source/WebCore/page/Settings.yaml >+++ b/Source/WebCore/page/Settings.yaml >@@ -571,7 +571,7 @@ layoutViewportHeightExpansionFactor: > > # Runtime-enabled features > visualViewportEnabled: >- initial: false >+ initial: true > onChange: setNeedsRecalcStyleInAllFrames > > visualViewportAPIEnabled: >diff --git a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp >index 537c0d0d6b817e47e36267700e0fa96e418435dd..0585ab6a9ab6bb2694571e85056c4754e3de093a 100644 >--- a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp >+++ b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp >@@ -145,7 +145,6 @@ void AsyncScrollingCoordinator::frameViewLayoutUpdated(FrameView& frameView) > frameScrollingNode.setFooterHeight(frameView.footerHeight()); > frameScrollingNode.setTopContentInset(frameView.topContentInset()); > >- frameScrollingNode.setVisualViewportEnabled(visualViewportEnabled()); > frameScrollingNode.setLayoutViewport(frameView.layoutViewportRect()); > frameScrollingNode.setAsyncFrameOrOverflowScrollingEnabled(asyncFrameOrOverflowScrollingEnabled()); > >@@ -387,17 +386,13 @@ void AsyncScrollingCoordinator::reconcileScrollingState(FrameView& frameView, co > [&frameView](Optional<FloatPoint> origin) { > if (origin) > frameView.setBaseLayoutViewportOrigin(LayoutPoint(origin.value()), FrameView::TriggerLayoutOrNot::No); >- }, [&frameView, &layoutViewportRect, viewportRectStability, visualViewportEnabled = visualViewportEnabled()](Optional<FloatRect> overrideRect) { >+ }, [&frameView, &layoutViewportRect, viewportRectStability](Optional<FloatRect> overrideRect) { > if (!overrideRect) > return; > > layoutViewportRect = overrideRect; >- if (visualViewportEnabled && viewportRectStability != ViewportRectStability::ChangingObscuredInsetsInteractively) >+ if (viewportRectStability != ViewportRectStability::ChangingObscuredInsetsInteractively) > frameView.setLayoutViewportOverrideRect(LayoutRect(overrideRect.value()), viewportRectStability == ViewportRectStability::Stable ? FrameView::TriggerLayoutOrNot::Yes : FrameView::TriggerLayoutOrNot::No); >-#if PLATFORM(IOS_FAMILY) >- else if (viewportRectStability == ViewportRectStability::Stable) >- frameView.setCustomFixedPositionLayoutRect(enclosingIntRect(overrideRect.value())); >-#endif > } > ); > >@@ -696,11 +691,6 @@ void AsyncScrollingCoordinator::setScrollPinningBehavior(ScrollPinningBehavior p > scrollingTree()->setScrollPinningBehavior(pinning); > } > >-bool AsyncScrollingCoordinator::visualViewportEnabled() const >-{ >- return m_page->mainFrame().settings().visualViewportEnabled(); >-} >- > bool AsyncScrollingCoordinator::asyncFrameOrOverflowScrollingEnabled() const > { > auto& settings = m_page->mainFrame().settings(); >diff --git a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h >index 104cc82bf852955fcefd34089c6db73d9c639a2f..aaba5e13f8b0dd93e69b15229d2b5bdb6e31cc32 100644 >--- a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h >+++ b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h >@@ -89,7 +89,6 @@ private: > > bool hasVisibleSlowRepaintViewportConstrainedObjects(const FrameView&) const override { return false; } > >- bool visualViewportEnabled() const; > bool asyncFrameOrOverflowScrollingEnabled() const; > > WEBCORE_EXPORT void frameViewLayoutUpdated(FrameView&) override; >diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp >index 01961fc0ec3b2d84a0fb916cc7e16ed707697a4f..d9b50bd74c04ba05c8809d8dabc5ac5f669c6111 100644 >--- a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp >+++ b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp >@@ -63,7 +63,6 @@ ScrollingStateFrameScrollingNode::ScrollingStateFrameScrollingNode(const Scrolli > , m_behaviorForFixed(stateNode.scrollBehaviorForFixedElements()) > , m_requestedScrollPositionRepresentsProgrammaticScroll(stateNode.requestedScrollPositionRepresentsProgrammaticScroll()) > , m_fixedElementsLayoutRelativeToFrame(stateNode.fixedElementsLayoutRelativeToFrame()) >- , m_visualViewportEnabled(stateNode.visualViewportEnabled()) > , m_asyncFrameOrOverflowScrollingEnabled(stateNode.asyncFrameOrOverflowScrollingEnabled()) > { > if (hasChangedProperty(RootContentsLayer)) >@@ -118,7 +117,6 @@ void ScrollingStateFrameScrollingNode::setAllPropertiesChanged() > setPropertyChangedBit(BehaviorForFixedElements); > setPropertyChangedBit(TopContentInset); > setPropertyChangedBit(FixedElementsLayoutRelativeToFrame); >- setPropertyChangedBit(VisualViewportEnabled); > setPropertyChangedBit(AsyncFrameOrOverflowScrollingEnabled); > setPropertyChangedBit(LayoutViewport); > setPropertyChangedBit(MinLayoutViewportOrigin); >@@ -299,16 +297,6 @@ void ScrollingStateFrameScrollingNode::setFixedElementsLayoutRelativeToFrame(boo > setPropertyChanged(FixedElementsLayoutRelativeToFrame); > } > >-// Only needed while visual viewports are runtime-switchable. >-void ScrollingStateFrameScrollingNode::setVisualViewportEnabled(bool visualViewportEnabled) >-{ >- if (visualViewportEnabled == m_visualViewportEnabled) >- return; >- >- m_visualViewportEnabled = visualViewportEnabled; >- setPropertyChanged(VisualViewportEnabled); >-} >- > void ScrollingStateFrameScrollingNode::setAsyncFrameOrOverflowScrollingEnabled(bool enabled) > { > if (enabled == m_asyncFrameOrOverflowScrollingEnabled) >@@ -348,12 +336,9 @@ void ScrollingStateFrameScrollingNode::dumpProperties(TextStream& ts, ScrollingS > if (m_footerHeight) > ts.dumpProperty("footer height", m_footerHeight); > >- if (m_visualViewportEnabled) { >- ts.dumpProperty("visual viewport enabled", m_visualViewportEnabled); >- ts.dumpProperty("layout viewport", m_layoutViewport); >- ts.dumpProperty("min layout viewport origin", m_minLayoutViewportOrigin); >- ts.dumpProperty("max layout viewport origin", m_maxLayoutViewportOrigin); >- } >+ ts.dumpProperty("layout viewport", m_layoutViewport); >+ ts.dumpProperty("min layout viewport origin", m_minLayoutViewportOrigin); >+ ts.dumpProperty("max layout viewport origin", m_maxLayoutViewportOrigin); > > if (m_behaviorForFixed == StickToViewportBounds) > ts.dumpProperty("behavior for fixed", m_behaviorForFixed); >diff --git a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h >index 99dcb3d9f2505ffcfade072b3861ac68cf958439..cf98d0467c10c6f197324ef8730c2586ccce8be5 100644 >--- a/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h >+++ b/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h >@@ -64,7 +64,6 @@ public: > BehaviorForFixedElements, > TopContentInset, > FixedElementsLayoutRelativeToFrame, >- VisualViewportEnabled, > AsyncFrameOrOverflowScrollingEnabled, > LayoutViewport, > MinLayoutViewportOrigin, >@@ -136,9 +135,6 @@ public: > bool fixedElementsLayoutRelativeToFrame() const { return m_fixedElementsLayoutRelativeToFrame; } > WEBCORE_EXPORT void setFixedElementsLayoutRelativeToFrame(bool); > >- bool visualViewportEnabled() const { return m_visualViewportEnabled; }; >- WEBCORE_EXPORT void setVisualViewportEnabled(bool); >- > bool asyncFrameOrOverflowScrollingEnabled() const { return m_asyncFrameOrOverflowScrollingEnabled; } > void setAsyncFrameOrOverflowScrollingEnabled(bool); > >@@ -185,7 +181,6 @@ private: > ScrollBehaviorForFixedElements m_behaviorForFixed { StickToDocumentBounds }; > bool m_requestedScrollPositionRepresentsProgrammaticScroll { false }; > bool m_fixedElementsLayoutRelativeToFrame { false }; >- bool m_visualViewportEnabled { false }; > bool m_asyncFrameOrOverflowScrollingEnabled { false }; > }; > >diff --git a/Source/WebCore/page/scrolling/ScrollingTree.cpp b/Source/WebCore/page/scrolling/ScrollingTree.cpp >index 1735b97f527529b86390c449616d936265ba34f7..19d4a98e4977d044a5f2298f6a08965b699c6b99 100644 >--- a/Source/WebCore/page/scrolling/ScrollingTree.cpp >+++ b/Source/WebCore/page/scrolling/ScrollingTree.cpp >@@ -155,7 +155,6 @@ void ScrollingTree::commitTreeState(std::unique_ptr<ScrollingStateTree> scrollin > && (rootStateNodeChanged > || rootNode->hasChangedProperty(ScrollingStateFrameScrollingNode::EventTrackingRegion) > || rootNode->hasChangedProperty(ScrollingStateScrollingNode::ScrolledContentsLayer) >- || rootNode->hasChangedProperty(ScrollingStateFrameScrollingNode::VisualViewportEnabled) > || rootNode->hasChangedProperty(ScrollingStateFrameScrollingNode::AsyncFrameOrOverflowScrollingEnabled))) { > LockHolder lock(m_mutex); > >@@ -165,9 +164,6 @@ void ScrollingTree::commitTreeState(std::unique_ptr<ScrollingStateTree> scrollin > if (rootStateNodeChanged || rootNode->hasChangedProperty(ScrollingStateFrameScrollingNode::EventTrackingRegion)) > m_eventTrackingRegions = scrollingStateTree->rootStateNode()->eventTrackingRegions(); > >- if (rootStateNodeChanged || rootNode->hasChangedProperty(ScrollingStateFrameScrollingNode::VisualViewportEnabled)) >- m_visualViewportEnabled = scrollingStateTree->rootStateNode()->visualViewportEnabled(); >- > if (rootStateNodeChanged || rootNode->hasChangedProperty(ScrollingStateFrameScrollingNode::AsyncFrameOrOverflowScrollingEnabled)) > m_asyncFrameOrOverflowScrollingEnabled = scrollingStateTree->rootStateNode()->asyncFrameOrOverflowScrollingEnabled(); > } >diff --git a/Source/WebCore/page/scrolling/ScrollingTree.h b/Source/WebCore/page/scrolling/ScrollingTree.h >index d9378532ddc619ea72a5a2a3fa22cd84c832b0ca..68ba220d2a6fd50b1b6e9c5e410b08f97d552ddc 100644 >--- a/Source/WebCore/page/scrolling/ScrollingTree.h >+++ b/Source/WebCore/page/scrolling/ScrollingTree.h >@@ -54,8 +54,6 @@ public: > virtual bool isRemoteScrollingTree() const { return false; } > virtual bool isScrollingTreeIOS() const { return false; } > >- bool visualViewportEnabled() const { return m_visualViewportEnabled; } >- > // This implies that we'll do hit-testing in the scrolling tree. > bool asyncFrameOrOverflowScrollingEnabled() const { return m_asyncFrameOrOverflowScrollingEnabled; } > void setAsyncFrameOrOverflowScrollingEnabled(bool); >@@ -156,7 +154,6 @@ public: > > protected: > void setMainFrameScrollPosition(FloatPoint); >- void setVisualViewportEnabled(bool b) { m_visualViewportEnabled = b; } > > WEBCORE_EXPORT virtual ScrollingEventResult handleWheelEvent(const PlatformWheelEvent&); > >@@ -193,7 +190,6 @@ private: > bool m_mainFrameIsScrollSnapping { false }; > bool m_scrollingPerformanceLoggingEnabled { false }; > bool m_isHandlingProgrammaticScroll { false }; >- bool m_visualViewportEnabled { false }; > bool m_asyncFrameOrOverflowScrollingEnabled { false }; > }; > >diff --git a/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp >index 258bb93e96614f2ba7bf9754c285271aa24b56a1..8509c4660b3b09d6a48219876373bb41c3423a21 100644 >--- a/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp >+++ b/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp >@@ -90,8 +90,6 @@ void ScrollingTreeFrameScrollingNode::setScrollPosition(const FloatPoint& scroll > > FloatRect ScrollingTreeFrameScrollingNode::layoutViewportForScrollPosition(const FloatPoint& visibleContentOrigin, float scale) const > { >- ASSERT(scrollingTree().visualViewportEnabled()); >- > FloatRect visibleContentRect(visibleContentOrigin, scrollableAreaSize()); > LayoutRect visualViewport(FrameView::visibleDocumentRect(visibleContentRect, headerHeight(), footerHeight(), totalContentsSize(), scale)); > LayoutRect layoutViewport(m_layoutViewport); >diff --git a/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm b/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm >index 1bed757939fba4db70bc6d706fe339c93fbde9b6..c731fd8303ac4a146a40a05dd093ea12892fa796 100644 >--- a/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm >+++ b/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm >@@ -244,13 +244,11 @@ void ScrollingTreeFrameScrollingNodeMac::setScrollPositionWithoutContentEdgeCons > { > updateMainFramePinState(scrollPosition); > >- Optional<FloatPoint> layoutViewportOrigin; >- if (scrollingTree().visualViewportEnabled()) { >- FloatPoint visibleContentOrigin = scrollPosition; >- FloatRect newLayoutViewport = layoutViewportForScrollPosition(visibleContentOrigin, frameScaleFactor()); >- setLayoutViewport(newLayoutViewport); >- layoutViewportOrigin = newLayoutViewport.location(); >- } >+ Optional<FloatPoint> layoutViewportOrigin; // FIXME >+ FloatPoint visibleContentOrigin = scrollPosition; >+ FloatRect newLayoutViewport = layoutViewportForScrollPosition(visibleContentOrigin, frameScaleFactor()); >+ setLayoutViewport(newLayoutViewport); >+ layoutViewportOrigin = newLayoutViewport.location(); > > if (shouldUpdateScrollLayerPositionSynchronously()) { > m_probableMainThreadScrollPosition = scrollPosition; >@@ -269,22 +267,9 @@ void ScrollingTreeFrameScrollingNodeMac::setScrollLayerPosition(const FloatPoint > scrolledContentsLayer().position = -position; > > FloatRect visibleContentRect(position, scrollableAreaSize()); >- FloatRect fixedPositionRect; >- ScrollBehaviorForFixedElements behaviorForFixed = StickToViewportBounds; >- >- if (scrollingTree().visualViewportEnabled()) >- fixedPositionRect = layoutViewport; >- else { >- behaviorForFixed = scrollBehaviorForFixedElements(); >- >- FloatPoint scrollPositionForFixedChildren = FrameView::scrollPositionForFixedPosition(enclosingLayoutRect(visibleContentRect), LayoutSize(totalContentsSize()), >- LayoutPoint(position), scrollOrigin(), frameScaleFactor(), fixedElementsLayoutRelativeToFrame(), behaviorForFixed, headerHeight(), footerHeight()); >- >- fixedPositionRect = { scrollPositionForFixedChildren, visibleContentRect.size() }; >- } >- >+ > if (m_counterScrollingLayer) >- m_counterScrollingLayer.get().position = fixedPositionRect.location(); >+ m_counterScrollingLayer.get().position = layoutViewport.location(); > > float topContentInset = this->topContentInset(); > if (m_insetClipLayer && m_rootContentsLayer && topContentInset) { >@@ -297,13 +282,8 @@ void ScrollingTreeFrameScrollingNodeMac::setScrollLayerPosition(const FloatPoint > if (m_headerLayer || m_footerLayer) { > // Generally the banners should have the same horizontal-position computation as a fixed element. However, > // the banners are not affected by the frameScaleFactor(), so if there is currently a non-1 frameScaleFactor() >- // then we should recompute fixedPositionRect.x() for the banner with a scale factor of 1. >- float horizontalScrollOffsetForBanner = fixedPositionRect.x(); >- if (!scrollingTree().visualViewportEnabled() && frameScaleFactor() != 1) { >- horizontalScrollOffsetForBanner = FrameView::scrollPositionForFixedPosition(enclosingLayoutRect(visibleContentRect), LayoutSize(totalContentsSize()), >- LayoutPoint(position), scrollOrigin(), 1, fixedElementsLayoutRelativeToFrame(), behaviorForFixed, headerHeight(), footerHeight()).x(); >- } >- >+ // then we should recompute layoutViewport.x() for the banner with a scale factor of 1. >+ float horizontalScrollOffsetForBanner = layoutViewport.x(); > if (m_headerLayer) > m_headerLayer.get().position = FloatPoint(horizontalScrollOffsetForBanner, FrameView::yPositionForHeaderLayer(position, topContentInset)); > >@@ -337,7 +317,7 @@ void ScrollingTreeFrameScrollingNodeMac::setScrollLayerPosition(const FloatPoint > return; > > for (auto& child : *m_children) >- child->updateLayersAfterAncestorChange(*this, fixedPositionRect, FloatSize()); >+ child->updateLayersAfterAncestorChange(*this, layoutViewport, FloatSize()); > } > > void ScrollingTreeFrameScrollingNodeMac::updateLayersAfterViewportChange(const FloatRect&, double) >diff --git a/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp b/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp >index 49466916df21ce99fa83d0b79f6e0907ebae403d..0b2faf1f34e17b47e555dd0b9e0c1555c49692de 100644 >--- a/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp >+++ b/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp >@@ -159,7 +159,6 @@ void ArgumentCoder<ScrollingStateFrameScrollingNode>::encode(Encoder& encoder, c > SCROLLING_NODE_ENCODE(ScrollingStateFrameScrollingNode::FooterHeight, footerHeight) > SCROLLING_NODE_ENCODE(ScrollingStateFrameScrollingNode::TopContentInset, topContentInset) > SCROLLING_NODE_ENCODE(ScrollingStateFrameScrollingNode::FixedElementsLayoutRelativeToFrame, fixedElementsLayoutRelativeToFrame) >- SCROLLING_NODE_ENCODE(ScrollingStateFrameScrollingNode::VisualViewportEnabled, visualViewportEnabled) > // AsyncFrameOrOverflowScrollingEnabled is not relevant for UI-side compositing. > SCROLLING_NODE_ENCODE(ScrollingStateFrameScrollingNode::LayoutViewport, layoutViewport) > SCROLLING_NODE_ENCODE(ScrollingStateFrameScrollingNode::MinLayoutViewportOrigin, minLayoutViewportOrigin) >@@ -274,7 +273,6 @@ bool ArgumentCoder<ScrollingStateFrameScrollingNode>::decode(Decoder& decoder, S > SCROLLING_NODE_DECODE(ScrollingStateFrameScrollingNode::FooterHeight, int, setFooterHeight); > SCROLLING_NODE_DECODE(ScrollingStateFrameScrollingNode::TopContentInset, float, setTopContentInset); > SCROLLING_NODE_DECODE(ScrollingStateFrameScrollingNode::FixedElementsLayoutRelativeToFrame, bool, setFixedElementsLayoutRelativeToFrame); >- SCROLLING_NODE_DECODE(ScrollingStateFrameScrollingNode::VisualViewportEnabled, bool, setVisualViewportEnabled) > SCROLLING_NODE_DECODE(ScrollingStateFrameScrollingNode::LayoutViewport, FloatRect, setLayoutViewport) > SCROLLING_NODE_DECODE(ScrollingStateFrameScrollingNode::MinLayoutViewportOrigin, FloatPoint, setMinLayoutViewportOrigin) > SCROLLING_NODE_DECODE(ScrollingStateFrameScrollingNode::MaxLayoutViewportOrigin, FloatPoint, setMaxLayoutViewportOrigin) >diff --git a/Source/WebKit/Shared/WebPreferences.yaml b/Source/WebKit/Shared/WebPreferences.yaml >index 74a122c5b77fc5d41a28891ca0a53df5dec9fafe..b9084beb90a43abf5b754864e902c65241a25991 100644 >--- a/Source/WebKit/Shared/WebPreferences.yaml >+++ b/Source/WebKit/Shared/WebPreferences.yaml >@@ -672,10 +672,6 @@ ApplePayCapabilityDisclosureAllowed: > defaultValue: true > condition: ENABLE(APPLE_PAY) > >-VisualViewportEnabled: >- type: bool >- defaultValue: true >- > LayoutViewportHeightExpansionFactor: > type: double > defaultValue: DEFAULT_VISUAL_VIEWPORT_HEIGHT_EXPANSION_FACTOR >diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm b/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm >index 337996b428e4f8db5348e399aa537356e569ca95..a0cd2e213b0dfc7a50094f7c919d5bd86dff45a3 100644 >--- a/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm >+++ b/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm >@@ -357,16 +357,6 @@ - (void)_setDisplayListDrawingEnabled:(BOOL)displayListDrawingEnabled > _preferences->setDisplayListDrawingEnabled(displayListDrawingEnabled); > } > >-- (BOOL)_visualViewportEnabled >-{ >- return _preferences->visualViewportEnabled(); >-} >- >-- (void)_setVisualViewportEnabled:(BOOL)_visualViewportEnabled >-{ >- _preferences->setVisualViewportEnabled(_visualViewportEnabled); >-} >- > - (BOOL)_largeImageAsyncDecodingEnabled > { > return _preferences->largeImageAsyncDecodingEnabled(); >diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h >index 87d0c7fc6a45a7ef3a48be93bb1ee6696ab74151..61da8b89cfba956ae6af00d248c498e17b0373da 100644 >--- a/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h >+++ b/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h >@@ -76,7 +76,6 @@ typedef NS_ENUM(NSInteger, _WKEditableLinkBehavior) { > @property (nonatomic, setter=_setSimpleLineLayoutDebugBordersEnabled:) BOOL _simpleLineLayoutDebugBordersEnabled WK_API_AVAILABLE(macosx(10.11), ios(9.0)); > @property (nonatomic, setter=_setAcceleratedDrawingEnabled:) BOOL _acceleratedDrawingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0)); > @property (nonatomic, setter=_setDisplayListDrawingEnabled:) BOOL _displayListDrawingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0)); >-@property (nonatomic, setter=_setVisualViewportEnabled:) BOOL _visualViewportEnabled WK_API_AVAILABLE(macosx(10.12.3), ios(10.3)); > @property (nonatomic, setter=_setLargeImageAsyncDecodingEnabled:) BOOL _largeImageAsyncDecodingEnabled WK_API_AVAILABLE(macosx(10.12.3), ios(10.3)); > @property (nonatomic, setter=_setAnimatedImageAsyncDecodingEnabled:) BOOL _animatedImageAsyncDecodingEnabled WK_API_AVAILABLE(macosx(10.12.3), ios(10.3)); > @property (nonatomic, setter=_setTextAutosizingEnabled:) BOOL _textAutosizingEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0)); >diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm >index a380a503ae9da3b96e3ee8671c784ba848d91a19..51a6fa740195fe1a009fcb620873f2031244d5c5 100644 >--- a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm >+++ b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeDrawingAreaProxy.mm >@@ -220,7 +220,7 @@ void RemoteLayerTreeDrawingAreaProxy::commitLayerTree(const RemoteLayerTreeTrans > #if PLATFORM(IOS_FAMILY) > if (m_webPageProxy.scrollingCoordinatorProxy()->hasFixedOrSticky()) { > // If we got a new layer for a fixed or sticky node, its position from the WebProcess is probably stale. We need to re-run the "viewport" changed logic to udpate it with our UI-side state. >- FloatRect customFixedPositionRect = m_webPageProxy.computeCustomFixedPositionRect(m_webPageProxy.unobscuredContentRect(), m_webPageProxy.unobscuredContentRectRespectingInputViewBounds(), m_webPageProxy.customFixedPositionRect(), m_webPageProxy.displayedContentScale(), FrameView::LayoutViewportConstraint::Unconstrained, m_webPageProxy.scrollingCoordinatorProxy()->visualViewportEnabled()); >+ FloatRect customFixedPositionRect = m_webPageProxy.computeCustomFixedPositionRect(m_webPageProxy.unobscuredContentRect(), m_webPageProxy.unobscuredContentRectRespectingInputViewBounds(), m_webPageProxy.customFixedPositionRect(), m_webPageProxy.displayedContentScale(), FrameView::LayoutViewportConstraint::Unconstrained); > m_webPageProxy.scrollingCoordinatorProxy()->viewportChangedViaDelegatedScrolling(m_webPageProxy.scrollingCoordinatorProxy()->rootScrollingNodeID(), customFixedPositionRect, m_webPageProxy.displayedContentScale()); > } > #endif >diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h >index 0a307097793e2be029185f521115b7bd8d119549..e5e46ad63992aaad2436f0382e2b79bd0e105cd8 100644 >--- a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h >+++ b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.h >@@ -51,8 +51,6 @@ public: > explicit RemoteScrollingCoordinatorProxy(WebPageProxy&); > virtual ~RemoteScrollingCoordinatorProxy(); > >- bool visualViewportEnabled() const { return m_scrollingTree && m_scrollingTree->visualViewportEnabled(); } >- > // Inform the web process that the scroll position changed (called from the scrolling tree) > void scrollingTreeNodeDidScroll(WebCore::ScrollingNodeID, const WebCore::FloatPoint& newScrollPosition, const Optional<WebCore::FloatPoint>& layoutViewportOrigin, WebCore::ScrollingLayerPositionAction); > void scrollingTreeNodeRequestsScroll(WebCore::ScrollingNodeID, const WebCore::FloatPoint& scrollPosition, bool representsProgrammaticScroll); >diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm b/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm >index 90252690f8259113f284cc215f521a941f3c3ae6..5d4da04642bc240a3df9bacbfebbf63ae9e354ce 100644 >--- a/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm >+++ b/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm >@@ -96,7 +96,7 @@ void RemoteScrollingCoordinatorProxy::connectStateNodeLayers(ScrollingStateTree& > FloatRect RemoteScrollingCoordinatorProxy::customFixedPositionRect() const > { > return m_webPageProxy.computeCustomFixedPositionRect(m_webPageProxy.unobscuredContentRect(), m_webPageProxy.unobscuredContentRectRespectingInputViewBounds(), m_webPageProxy.customFixedPositionRect(), >- m_webPageProxy.displayedContentScale(), FrameView::LayoutViewportConstraint::Unconstrained, visualViewportEnabled()); >+ m_webPageProxy.displayedContentScale(), FrameView::LayoutViewportConstraint::Unconstrained); > } > > void RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartPanGesture() >diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h >index faaa5b721df5efff5b121a7126a09f0a1e84e8ba..70e81d52e8e0a658886653ccf0b32eccef628f7a 100644 >--- a/Source/WebKit/UIProcess/WebPageProxy.h >+++ b/Source/WebKit/UIProcess/WebPageProxy.h >@@ -615,7 +615,7 @@ public: > void updateVisibleContentRects(const VisibleContentRectUpdateInfo&); > void resendLastVisibleContentRects(); > >- WebCore::FloatRect computeCustomFixedPositionRect(const WebCore::FloatRect& unobscuredContentRect, const WebCore::FloatRect& unobscuredContentRectRespectingInputViewBounds, const WebCore::FloatRect& currentCustomFixedPositionRect, double displayedContentScale, WebCore::FrameView::LayoutViewportConstraint = WebCore::FrameView::LayoutViewportConstraint::Unconstrained, bool visualViewportEnabled = false) const; >+ WebCore::FloatRect computeCustomFixedPositionRect(const WebCore::FloatRect& unobscuredContentRect, const WebCore::FloatRect& unobscuredContentRectRespectingInputViewBounds, const WebCore::FloatRect& currentCustomFixedPositionRect, double displayedContentScale, WebCore::FrameView::LayoutViewportConstraint = WebCore::FrameView::LayoutViewportConstraint::Unconstrained) const; > > void scrollingNodeScrollViewWillStartPanGesture(); > void scrollingNodeScrollViewDidScroll(); >diff --git a/Source/WebKit/UIProcess/ios/WKContentView.mm b/Source/WebKit/UIProcess/ios/WKContentView.mm >index 304c23f401bff648e83286d23f3db5e5e4225508..ce12221e7162babe4f9156a9022da50a687124ab 100644 >--- a/Source/WebKit/UIProcess/ios/WKContentView.mm >+++ b/Source/WebKit/UIProcess/ios/WKContentView.mm >@@ -405,7 +405,7 @@ - (void)didUpdateVisibleRect:(CGRect)visibleContentRect > WebKit::RemoteScrollingCoordinatorProxy* scrollingCoordinator = _page->scrollingCoordinatorProxy(); > > CGRect unobscuredContentRectRespectingInputViewBounds = [self _computeUnobscuredContentRectRespectingInputViewBounds:unobscuredContentRect inputViewBounds:inputViewBounds]; >- WebCore::FloatRect fixedPositionRectForLayout = _page->computeCustomFixedPositionRect(unobscuredContentRect, unobscuredContentRectRespectingInputViewBounds, _page->customFixedPositionRect(), zoomScale, WebCore::FrameView::LayoutViewportConstraint::ConstrainedToDocumentRect, scrollingCoordinator->visualViewportEnabled()); >+ WebCore::FloatRect fixedPositionRectForLayout = _page->computeCustomFixedPositionRect(unobscuredContentRect, unobscuredContentRectRespectingInputViewBounds, _page->customFixedPositionRect(), zoomScale, WebCore::FrameView::LayoutViewportConstraint::ConstrainedToDocumentRect); > > WebKit::VisibleContentRectUpdateInfo visibleContentRectUpdateInfo( > visibleContentRect, >@@ -435,7 +435,7 @@ - (void)didUpdateVisibleRect:(CGRect)visibleContentRect > > _sizeChangedSinceLastVisibleContentRectUpdate = NO; > >- WebCore::FloatRect fixedPositionRect = _page->computeCustomFixedPositionRect(_page->unobscuredContentRect(), _page->unobscuredContentRectRespectingInputViewBounds(), _page->customFixedPositionRect(), zoomScale, WebCore::FrameView::LayoutViewportConstraint::Unconstrained, scrollingCoordinator->visualViewportEnabled()); >+ WebCore::FloatRect fixedPositionRect = _page->computeCustomFixedPositionRect(_page->unobscuredContentRect(), _page->unobscuredContentRectRespectingInputViewBounds(), _page->customFixedPositionRect(), zoomScale, WebCore::FrameView::LayoutViewportConstraint::Unconstrained); > scrollingCoordinator->viewportChangedViaDelegatedScrolling(scrollingCoordinator->rootScrollingNodeID(), fixedPositionRect, zoomScale); > > drawingArea->updateDebugIndicator(); >diff --git a/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm b/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm >index e5006ede5b504228143716adc7a405838f343943..ffe39952a3800e73f50e1e81a1353de9759f8b6b 100644 >--- a/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm >+++ b/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm >@@ -253,14 +253,11 @@ static inline float adjustedUnexposedMaxEdge(float documentEdge, float exposedRe > } > > // FIXME: rename this when visual viewports are the default. >-WebCore::FloatRect WebPageProxy::computeCustomFixedPositionRect(const FloatRect& unobscuredContentRect, const FloatRect& unobscuredContentRectRespectingInputViewBounds, const FloatRect& currentCustomFixedPositionRect, double displayedContentScale, FrameView::LayoutViewportConstraint constraint, bool visualViewportEnabled) const >+WebCore::FloatRect WebPageProxy::computeCustomFixedPositionRect(const FloatRect& unobscuredContentRect, const FloatRect& unobscuredContentRectRespectingInputViewBounds, const FloatRect& currentCustomFixedPositionRect, double displayedContentScale, FrameView::LayoutViewportConstraint constraint) const > { > FloatRect constrainedUnobscuredRect = unobscuredContentRect; > FloatRect documentRect = pageClient().documentRect(); > >- if (!visualViewportEnabled && pageClient().isFocusingElement()) >- return documentRect; >- > if (constraint == FrameView::LayoutViewportConstraint::ConstrainedToDocumentRect) > constrainedUnobscuredRect.intersect(documentRect); > >@@ -276,9 +273,6 @@ WebCore::FloatRect WebPageProxy::computeCustomFixedPositionRect(const FloatRect& > constrainedUnobscuredRect.setHeight(adjustedUnexposedMaxEdge(documentRect.maxY(), constrainedUnobscuredRect.maxY(), factor) - constrainedUnobscuredRect.y()); > } > >- if (!visualViewportEnabled) >- return FrameView::rectForViewportConstrainedObjects(enclosingLayoutRect(constrainedUnobscuredRect), LayoutSize(documentRect.size()), displayedContentScale, false, StickToViewportBounds); >- > FloatSize constrainedSize = isBelowMinimumScale ? constrainedUnobscuredRect.size() : unobscuredContentRect.size(); > FloatRect unobscuredContentRectForViewport = isBelowMinimumScale ? constrainedUnobscuredRect : unobscuredContentRectRespectingInputViewBounds; > >diff --git a/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp b/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp >index 39461adb83a0e4d5e3f7dfdff735739054e43984..8a5d414c342d3280e06b3accbea67d4547c62cb0 100644 >--- a/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp >+++ b/Source/WebKit/WebProcess/Automation/WebAutomationSessionProxy.cpp >@@ -578,10 +578,7 @@ void WebAutomationSessionProxy::computeElementLayout(uint64_t pageID, uint64_t f > break; > case CoordinateSystem::LayoutViewport: > // The element bounds are already in client coordinates. >- if (frame->coreFrame()->settings().visualViewportEnabled()) >- resultElementBounds = WebCore::IntRect(mainView->clientToLayoutViewportRect(WebCore::FloatRect(rootElementBounds))); >- else >- resultElementBounds = rootElementBounds; >+ resultElementBounds = WebCore::IntRect(mainView->clientToLayoutViewportRect(WebCore::FloatRect(rootElementBounds))); > break; > } > >@@ -597,10 +594,7 @@ void WebAutomationSessionProxy::computeElementLayout(uint64_t pageID, uint64_t f > break; > case CoordinateSystem::LayoutViewport: > // The point is already in client coordinates. >- if (frame->coreFrame()->settings().visualViewportEnabled()) >- resultInViewCenterPoint = WebCore::IntPoint(mainView->clientToLayoutViewportPoint(rootInViewCenterPoint)); >- else >- resultInViewCenterPoint = rootInViewCenterPoint; >+ resultInViewCenterPoint = WebCore::IntPoint(mainView->clientToLayoutViewportPoint(rootInViewCenterPoint)); > break; > } > } >diff --git a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp >index 1dbbdcfe497669a7b1925d95c0babc8fe3b9677b..9eecbe28959fbf80b5f0dcf7a065d08942a8e9d3 100644 >--- a/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp >+++ b/Source/WebKit/WebProcess/InjectedBundle/InjectedBundle.cpp >@@ -281,7 +281,6 @@ void InjectedBundle::overrideBoolPreferenceForTestRunner(WebPageGroupProxy* page > macro(WebKitXSSAuditorEnabled, XSSAuditorEnabled, xssAuditorEnabled) \ > macro(WebKitShouldRespectImageOrientation, ShouldRespectImageOrientation, shouldRespectImageOrientation) \ > macro(WebKitDisplayImagesKey, LoadsImagesAutomatically, loadsImagesAutomatically) \ >- macro(WebKitVisualViewportEnabled, VisualViewportEnabled, visualViewportEnabled) \ > macro(WebKitLargeImageAsyncDecodingEnabled, LargeImageAsyncDecodingEnabled, largeImageAsyncDecodingEnabled) \ > macro(WebKitAnimatedImageAsyncDecodingEnabled, AnimatedImageAsyncDecodingEnabled, animatedImageAsyncDecodingEnabled) \ > \ >diff --git a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm >index e15e79be15356d20d1b582f0d7cf4aab33ea9edf..50f85c1adfb1a30c5c3cb391e706f213aae0a8bc 100644 >--- a/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm >+++ b/Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm >@@ -2401,14 +2401,6 @@ void WebPage::getFocusedElementInformation(FocusedElementInformation& informatio > renderer->localToContainerPoint(FloatPoint(), nullptr, UseTransforms, &inFixed); > information.insideFixedPosition = inFixed; > information.isRTL = renderer->style().direction() == TextDirection::RTL; >- >- auto* frameView = elementFrame.view(); >- if (inFixed && elementFrame.isMainFrame() && !frameView->frame().settings().visualViewportEnabled()) { >- IntRect currentFixedPositionRect = frameView->customFixedPositionLayoutRect(); >- frameView->setCustomFixedPositionLayoutRect(frameView->renderView()->documentRect()); >- information.elementRect = frameView->contentsToRootView(renderer->absoluteBoundingBoxRect()); >- frameView->setCustomFixedPositionLayoutRect(currentFixedPositionRect); >- } > } else > information.elementRect = IntRect(); > >@@ -2781,15 +2773,10 @@ void WebPage::dynamicViewportSizeUpdate(const FloatSize& viewLayoutSize, const W > frameView.updateLayoutAndStyleIfNeededRecursive(); > > auto& settings = frameView.frame().settings(); >- if (settings.visualViewportEnabled()) { >- LayoutRect documentRect = IntRect(frameView.scrollOrigin(), frameView.contentsSize()); >- auto layoutViewportSize = FrameView::expandedLayoutViewportSize(frameView.baseLayoutViewportSize(), LayoutSize(documentRect.size()), settings.layoutViewportHeightExpansionFactor()); >- LayoutRect layoutViewportRect = FrameView::computeUpdatedLayoutViewportRect(frameView.layoutViewportRect(), documentRect, LayoutSize(newUnobscuredContentRect.size()), LayoutRect(newUnobscuredContentRect), layoutViewportSize, frameView.minStableLayoutViewportOrigin(), frameView.maxStableLayoutViewportOrigin(), FrameView::LayoutViewportConstraint::ConstrainedToDocumentRect); >- frameView.setLayoutViewportOverrideRect(layoutViewportRect); >- } else { >- IntRect fixedPositionLayoutRect = enclosingIntRect(frameView.viewportConstrainedObjectsRect()); >- frameView.setCustomFixedPositionLayoutRect(fixedPositionLayoutRect); >- } >+ LayoutRect documentRect = IntRect(frameView.scrollOrigin(), frameView.contentsSize()); >+ auto layoutViewportSize = FrameView::expandedLayoutViewportSize(frameView.baseLayoutViewportSize(), LayoutSize(documentRect.size()), settings.layoutViewportHeightExpansionFactor()); >+ LayoutRect layoutViewportRect = FrameView::computeUpdatedLayoutViewportRect(frameView.layoutViewportRect(), documentRect, LayoutSize(newUnobscuredContentRect.size()), LayoutRect(newUnobscuredContentRect), layoutViewportSize, frameView.minStableLayoutViewportOrigin(), frameView.maxStableLayoutViewportOrigin(), FrameView::LayoutViewportConstraint::ConstrainedToDocumentRect); >+ frameView.setLayoutViewportOverrideRect(layoutViewportRect); > > frameView.setCustomSizeForResizeEvent(expandedIntSize(targetUnobscuredRectInScrollViewCoordinates.size())); > setDeviceOrientation(deviceOrientation); >@@ -3053,23 +3040,20 @@ void WebPage::updateVisibleContentRects(const VisibleContentRectUpdateInfo& visi > frameView.setScrollVelocity(horizontalVelocity, verticalVelocity, scaleChangeRate, visibleContentRectUpdateInfo.timestamp()); > > if (m_isInStableState) { >- if (frameView.frame().settings().visualViewportEnabled()) { >- if (visibleContentRectUpdateInfo.unobscuredContentRect() != visibleContentRectUpdateInfo.unobscuredContentRectRespectingInputViewBounds()) >- frameView.setVisualViewportOverrideRect(LayoutRect(visibleContentRectUpdateInfo.unobscuredContentRectRespectingInputViewBounds())); >- else >- frameView.setVisualViewportOverrideRect(WTF::nullopt); >- >- LOG_WITH_STREAM(VisibleRects, stream << "WebPage::updateVisibleContentRects - setLayoutViewportOverrideRect " << visibleContentRectUpdateInfo.customFixedPositionRect()); >- frameView.setLayoutViewportOverrideRect(LayoutRect(visibleContentRectUpdateInfo.customFixedPositionRect())); >- if (selectionIsInsideFixedPositionContainer(frame)) { >- // Ensure that the next layer tree commit contains up-to-date caret/selection rects. >- frameView.frame().selection().setCaretRectNeedsUpdate(); >- sendPartialEditorStateAndSchedulePostLayoutUpdate(); >- } >+ if (visibleContentRectUpdateInfo.unobscuredContentRect() != visibleContentRectUpdateInfo.unobscuredContentRectRespectingInputViewBounds()) >+ frameView.setVisualViewportOverrideRect(LayoutRect(visibleContentRectUpdateInfo.unobscuredContentRectRespectingInputViewBounds())); >+ else >+ frameView.setVisualViewportOverrideRect(WTF::nullopt); >+ >+ LOG_WITH_STREAM(VisibleRects, stream << "WebPage::updateVisibleContentRects - setLayoutViewportOverrideRect " << visibleContentRectUpdateInfo.customFixedPositionRect()); >+ frameView.setLayoutViewportOverrideRect(LayoutRect(visibleContentRectUpdateInfo.customFixedPositionRect())); >+ if (selectionIsInsideFixedPositionContainer(frame)) { >+ // Ensure that the next layer tree commit contains up-to-date caret/selection rects. >+ frameView.frame().selection().setCaretRectNeedsUpdate(); >+ sendPartialEditorStateAndSchedulePostLayoutUpdate(); >+ } > >- frameView.didUpdateViewportOverrideRects(); >- } else >- frameView.setCustomFixedPositionLayoutRect(enclosingIntRect(visibleContentRectUpdateInfo.customFixedPositionRect())); >+ frameView.didUpdateViewportOverrideRects(); > } > > if (!visibleContentRectUpdateInfo.isChangingObscuredInsetsInteractively()) >diff --git a/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h b/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h >index da4d627ce823316547171406c374cb9f9a078430..ced335586dbe975dda3616d92e68db96e5972787 100644 >--- a/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h >+++ b/Source/WebKitLegacy/mac/WebView/WebPreferenceKeysPrivate.h >@@ -181,7 +181,6 @@ > #define WebKitReadableByteStreamAPIEnabledPreferenceKey @"WebKitReadableByteStreamAPIEnabled" > #define WebKitDownloadAttributeEnabledPreferenceKey @"WebKitDownloadAttributeEnabled" > #define WebKitDirectoryUploadEnabledPreferenceKey @"WebKitDirectoryUploadEnabled" >-#define WebKitVisualViewportEnabledPreferenceKey @"WebKitVisualViewportEnabled" > #define WebKitVisualViewportAPIEnabledPreferenceKey @"WebKitVisualViewportAPIEnabled" > #define WebKitCSSOMViewScrollingAPIEnabledPreferenceKey @"WebKitCSSOMViewScrollingAPIEnabled" > #define WebKitModernMediaControlsEnabledPreferenceKey @"WebKitModernMediaControlsEnabled" >diff --git a/Source/WebKitLegacy/mac/WebView/WebPreferences.mm b/Source/WebKitLegacy/mac/WebView/WebPreferences.mm >index 261ff1758d57f9db80ff85703a4e4a0ffe2ba054..58d79b8352d753d6c36971078b8ff8f8141d53ef 100644 >--- a/Source/WebKitLegacy/mac/WebView/WebPreferences.mm >+++ b/Source/WebKitLegacy/mac/WebView/WebPreferences.mm >@@ -651,11 +651,10 @@ + (void)initialize > [NSNumber numberWithBool:YES], WebKitWebAnimationsEnabledPreferenceKey, > > #if PLATFORM(IOS_FAMILY) >- [NSNumber numberWithBool:NO], WebKitVisualViewportEnabledPreferenceKey, >+ @NO, WebKitVisualViewportAPIEnabledPreferenceKey, > #else >- [NSNumber numberWithBool:YES], WebKitVisualViewportEnabledPreferenceKey, >+ @YES, WebKitVisualViewportAPIEnabledPreferenceKey, > #endif >- [NSNumber numberWithBool:YES], WebKitVisualViewportAPIEnabledPreferenceKey, > > [NSNumber numberWithBool:NO], WebKitCSSOMViewScrollingAPIEnabledPreferenceKey, > [NSNumber numberWithBool:YES], WebKitNeedsStorageAccessFromFileURLsQuirkKey, >@@ -3119,16 +3118,6 @@ - (BOOL)directoryUploadEnabled > return [self _boolValueForKey:WebKitDirectoryUploadEnabledPreferenceKey]; > } > >-- (BOOL)visualViewportEnabled >-{ >- return [self _boolValueForKey:WebKitVisualViewportEnabledPreferenceKey]; >-} >- >-- (void)setVisualViewportEnabled:(BOOL)flag >-{ >- [self _setBoolValue:flag forKey:WebKitVisualViewportEnabledPreferenceKey]; >-} >- > - (BOOL)visualViewportAPIEnabled > { > return [self _boolValueForKey:WebKitVisualViewportAPIEnabledPreferenceKey]; >diff --git a/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h b/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h >index ffaf05a58c6c4f709e2758072f982412e3f3c308..6b9d7a51bde0915ba98650f4c501c48fa5dd29fa 100644 >--- a/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h >+++ b/Source/WebKitLegacy/mac/WebView/WebPreferencesPrivate.h >@@ -588,7 +588,6 @@ extern NSString *WebPreferencesCacheModelChangedInternalNotification WEBKIT_DEPR > - (BOOL)adClickAttributionEnabled; > - (void)setAdClickAttributionEnabled:(BOOL)flag; > >-@property (nonatomic) BOOL visualViewportEnabled; > @property (nonatomic) BOOL visualViewportAPIEnabled; > @property (nonatomic) BOOL CSSOMViewScrollingAPIEnabled; > @property (nonatomic) BOOL largeImageAsyncDecodingEnabled; >diff --git a/Source/WebKitLegacy/mac/WebView/WebView.mm b/Source/WebKitLegacy/mac/WebView/WebView.mm >index 480f88502cb5bd55d7ea6d6702a6c6976520c018..f1a2dbac8c1406c49ac89608e8f3870e7eaf2496 100644 >--- a/Source/WebKitLegacy/mac/WebView/WebView.mm >+++ b/Source/WebKitLegacy/mac/WebView/WebView.mm >@@ -2970,7 +2970,6 @@ - (void)_preferencesChanged:(WebPreferences *)preferences > > settings.setJavaScriptCanOpenWindowsAutomatically([preferences javaScriptCanOpenWindowsAutomatically] || shouldAllowWindowOpenWithoutUserGesture()); > >- settings.setVisualViewportEnabled([preferences visualViewportEnabled]); > settings.setVisualViewportAPIEnabled([preferences visualViewportAPIEnabled]); > settings.setCSSOMViewScrollingAPIEnabled([preferences CSSOMViewScrollingAPIEnabled]); > settings.setMediaContentTypesRequiringHardwareSupport([preferences mediaContentTypesRequiringHardwareSupport]); >@@ -3005,6 +3004,8 @@ - (void)_preferencesChanged:(WebPreferences *)preferences > settings.setAllowsAirPlayForMediaPlayback([preferences allowsAirPlayForMediaPlayback]); > #endif > #if PLATFORM(IOS_FAMILY) >+ settings.setVisualViewportEnabled(false); >+ settings.setVisualViewportAPIEnabled(false); > settings.setStandalone([preferences _standalone]); > settings.setTelephoneNumberParsingEnabled([preferences _telephoneNumberParsingEnabled]); > settings.setAllowMultiElementImplicitSubmission([preferences _allowMultiElementImplicitFormSubmission]); >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index 2eade4224053ffeeb1dbfb1d666f4507bd2b8247..8a6d33bb496252dec901f21ebc3a7c67b5db4e76 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,33 @@ >+2019-02-21 Simon Fraser <simon.fraser@apple.com> >+ >+ Hardcode Visual Viewports on everywhere except iOS WK1 >+ https://bugs.webkit.org/show_bug.cgi?id=194928 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Remove the WK1 and WK2 preferences and MiniBrowser menu item for "visual viewports", >+ change the default value of the Setting to 'true', and hardcode WebView on iOS to >+ set it to false. The setting has shipped for several years and there's no need to turn >+ it off now. >+ >+ Similarly, disable the "Visual Viewport API" on iOS WK1, since it makes no sense if >+ Visual Viewports are not enabled. >+ >+ Remove the "visualViewportEnabled" flag and unused code paths from scrolling tree code >+ that only runs in WK2 >+ >+ * MiniBrowser/mac/SettingsController.h: >+ * MiniBrowser/mac/SettingsController.m: >+ (-[SettingsController init]): >+ (-[SettingsController _populateMenu]): >+ (-[SettingsController validateMenuItem:]): >+ (-[SettingsController visualViewportEnabled]): Deleted. >+ (-[SettingsController toggleVisualViewportEnabled:]): Deleted. >+ * MiniBrowser/mac/WK1BrowserWindowController.m: >+ (-[WK1BrowserWindowController didChangeSettings]): >+ * MiniBrowser/mac/WK2BrowserWindowController.m: >+ (-[WK2BrowserWindowController didChangeSettings]): >+ > 2019-02-20 Chris Dumez <cdumez@apple.com> > > Add API test for <rdar://problem/47471222> >diff --git a/Tools/MiniBrowser/mac/SettingsController.h b/Tools/MiniBrowser/mac/SettingsController.h >index 1827f61cf6e83fff7399d0f2e48b0775c49982f3..7378ca77db6736a380576e91333721bc914a43a1 100644 >--- a/Tools/MiniBrowser/mac/SettingsController.h >+++ b/Tools/MiniBrowser/mac/SettingsController.h >@@ -53,7 +53,6 @@ @property (nonatomic, readonly) BOOL acceleratedDrawingEnabled; > @property (nonatomic, readonly) BOOL displayListDrawingEnabled; > @property (nonatomic, readonly) BOOL subpixelAntialiasedLayerTextEnabled; > @property (nonatomic, readonly) BOOL resourceLoadStatisticsEnabled; >-@property (nonatomic, readonly) BOOL visualViewportEnabled; > @property (nonatomic, readonly) BOOL largeImageAsyncDecodingEnabled; > @property (nonatomic, readonly) BOOL animatedImageAsyncDecodingEnabled; > @property (nonatomic, readonly) BOOL appleColorFilterEnabled; >diff --git a/Tools/MiniBrowser/mac/SettingsController.m b/Tools/MiniBrowser/mac/SettingsController.m >index 85836daf89f657fee29f67bde0935dcb71f1bc63..70494ccd98c29738b6ef830bf51854595c063e7a 100644 >--- a/Tools/MiniBrowser/mac/SettingsController.m >+++ b/Tools/MiniBrowser/mac/SettingsController.m >@@ -62,7 +62,6 @@ > static NSString * const UsePaginatedModePreferenceKey = @"UsePaginatedMode"; > static NSString * const EnableSubPixelCSSOMMetricsPreferenceKey = @"EnableSubPixelCSSOMMetrics"; > >-static NSString * const VisualViewportEnabledPreferenceKey = @"VisualViewportEnabled"; > static NSString * const LargeImageAsyncDecodingEnabledPreferenceKey = @"LargeImageAsyncDecodingEnabled"; > static NSString * const AnimatedImageAsyncDecodingEnabledPreferenceKey = @"AnimatedImageAsyncDecodingEnabled"; > static NSString * const AppleColorFilterEnabledPreferenceKey = @"AppleColorFilterEnabled"; >@@ -113,7 +112,6 @@ - (instancetype)init > #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 > SubpixelAntialiasedLayerTextEnabledPreferenceKey, > #endif >- VisualViewportEnabledPreferenceKey, > LargeImageAsyncDecodingEnabledPreferenceKey, > AnimatedImageAsyncDecodingEnabledPreferenceKey, > ]; >@@ -170,7 +168,6 @@ - (void)_populateMenu > [self _addItemWithTitle:@"Enable Accelerated Drawing" action:@selector(toggleAcceleratedDrawingEnabled:) indented:NO]; > [self _addItemWithTitle:@"Enable Display List Drawing" action:@selector(toggleDisplayListDrawingEnabled:) indented:NO]; > [self _addItemWithTitle:@"Enable Subpixel-antialiased Layer Text" action:@selector(toggleSubpixelAntialiasedLayerTextEnabled:) indented:NO]; >- [self _addItemWithTitle:@"Enable Visual Viewport" action:@selector(toggleVisualViewportEnabled:) indented:NO]; > [self _addItemWithTitle:@"Enable Resource Load Statistics" action:@selector(toggleResourceLoadStatisticsEnabled:) indented:NO]; > [self _addItemWithTitle:@"Enable Large Image Async Decoding" action:@selector(toggleLargeImageAsyncDecodingEnabled:) indented:NO]; > [self _addItemWithTitle:@"Enable Animated Image Async Decoding" action:@selector(toggleAnimatedImageAsyncDecodingEnabled:) indented:NO]; >@@ -291,8 +288,6 @@ - (BOOL)validateMenuItem:(NSMenuItem *)menuItem > [menuItem setState:[self punchOutWhiteBackgroundsInDarkMode] ? NSControlStateValueOn : NSControlStateValueOff]; > else if (action == @selector(toggleUseSystemAppearance:)) > [menuItem setState:[self useSystemAppearance] ? NSControlStateValueOn : NSControlStateValueOff]; >- else if (action == @selector(toggleVisualViewportEnabled:)) >- [menuItem setState:[self visualViewportEnabled] ? NSControlStateValueOn : NSControlStateValueOff]; > else if (action == @selector(toggleReserveSpaceForBanners:)) > [menuItem setState:[self isSpaceReservedForBanners] ? NSControlStateValueOn : NSControlStateValueOff]; > else if (action == @selector(toggleShowTiledScrollingIndicator:)) >@@ -556,16 +551,6 @@ - (void)toggleResourceLoadStatisticsEnabled:(id)sender > [self _toggleBooleanDefault:ResourceLoadStatisticsEnabledPreferenceKey]; > } > >-- (BOOL)visualViewportEnabled >-{ >- return [[NSUserDefaults standardUserDefaults] boolForKey:VisualViewportEnabledPreferenceKey]; >-} >- >-- (void)toggleVisualViewportEnabled:(id)sender >-{ >- [self _toggleBooleanDefault:VisualViewportEnabledPreferenceKey]; >-} >- > - (BOOL)resourceLoadStatisticsEnabled > { > return [[NSUserDefaults standardUserDefaults] boolForKey:ResourceLoadStatisticsEnabledPreferenceKey]; >diff --git a/Tools/MiniBrowser/mac/WK1BrowserWindowController.m b/Tools/MiniBrowser/mac/WK1BrowserWindowController.m >index 62094d9bc101f0517042c726a71bab92a9a8c119..41d1a78bc61e2d7825d9373c96a760a92bd56f5f 100644 >--- a/Tools/MiniBrowser/mac/WK1BrowserWindowController.m >+++ b/Tools/MiniBrowser/mac/WK1BrowserWindowController.m >@@ -308,7 +308,6 @@ - (void)didChangeSettings > [[WebPreferences standardPreferences] setAcceleratedDrawingEnabled:settings.acceleratedDrawingEnabled]; > [[WebPreferences standardPreferences] setSubpixelAntialiasedLayerTextEnabled:settings.subpixelAntialiasedLayerTextEnabled]; > [[WebPreferences standardPreferences] setResourceLoadStatisticsEnabled:settings.resourceLoadStatisticsEnabled]; >- [[WebPreferences standardPreferences] setVisualViewportEnabled:settings.visualViewportEnabled]; > [[WebPreferences standardPreferences] setLargeImageAsyncDecodingEnabled:settings.largeImageAsyncDecodingEnabled]; > [[WebPreferences standardPreferences] setAnimatedImageAsyncDecodingEnabled:settings.animatedImageAsyncDecodingEnabled]; > [[WebPreferences standardPreferences] setColorFilterEnabled:settings.appleColorFilterEnabled]; >diff --git a/Tools/MiniBrowser/mac/WK2BrowserWindowController.m b/Tools/MiniBrowser/mac/WK2BrowserWindowController.m >index 721e48d948fe04dc87716443545d75401fe4ab89..5b77de59f7380c20c5c34f3e3966c9eca7475af3 100644 >--- a/Tools/MiniBrowser/mac/WK2BrowserWindowController.m >+++ b/Tools/MiniBrowser/mac/WK2BrowserWindowController.m >@@ -406,7 +406,6 @@ - (void)didChangeSettings > preferences._resourceUsageOverlayVisible = settings.resourceUsageOverlayVisible; > preferences._displayListDrawingEnabled = settings.displayListDrawingEnabled; > preferences._subpixelAntialiasedLayerTextEnabled = settings.subpixelAntialiasedLayerTextEnabled; >- preferences._visualViewportEnabled = settings.visualViewportEnabled; > preferences._largeImageAsyncDecodingEnabled = settings.largeImageAsyncDecodingEnabled; > preferences._animatedImageAsyncDecodingEnabled = settings.animatedImageAsyncDecodingEnabled; > preferences._colorFilterEnabled = settings.appleColorFilterEnabled; >diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog >index 41f337635c2aa793b509b1c96e917d4e3cec9ebe..d2e7d032403d97f5ee73971c812557b15ee0891c 100644 >--- a/LayoutTests/ChangeLog >+++ b/LayoutTests/ChangeLog >@@ -1,3 +1,97 @@ >+2019-02-21 Simon Fraser <simon.fraser@apple.com> >+ >+ Hardcode Visual Viewports on everywhere except iOS WK1 >+ https://bugs.webkit.org/show_bug.cgi?id=194928 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Remove "(visual viewport enabled 1)" from scrolling tree dumps. Remove calls >+ to "internals.settings.setVisualViewportEnabled(true)" >+ >+ * fast/dom/elementFromPoint-scaled-scrolled-layout-viewport.html: >+ * fast/events/ios/rotation/resources/rotation-utils.js: >+ * fast/visual-viewport/client-coordinates-relative-to-layout-viewport.html: >+ * fast/visual-viewport/client-rects-relative-to-layout-viewport-zoomed.html: >+ * fast/visual-viewport/client-rects-relative-to-layout-viewport.html: >+ * fast/visual-viewport/nonzoomed-rects.html: >+ * fast/visual-viewport/resize-event-fired-window-resized.html: >+ * fast/visual-viewport/resize-event-fired.html: >+ * fast/visual-viewport/rtl-nonzoomed-rects.html: >+ * fast/visual-viewport/rtl-zoomed-rects.html: >+ * fast/visual-viewport/rubberbanding-viewport-rects-extended-background.html: >+ * fast/visual-viewport/rubberbanding-viewport-rects-header-footer.html: >+ * fast/visual-viewport/rubberbanding-viewport-rects.html: >+ * fast/visual-viewport/scroll-event-fired.html: >+ * fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt: >+ * fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt: >+ * fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up.html: >+ * fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down.html: >+ * fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt: >+ * fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state.html: >+ * fast/visual-viewport/viewport-dimensions-exclude-custom-scrollbars.html: >+ * fast/visual-viewport/viewport-dimensions-exclude-scrollbars.html: >+ * fast/visual-viewport/viewport-dimensions-iframe.html: >+ * fast/visual-viewport/viewport-dimensions-under-page-zoom.html: >+ * fast/visual-viewport/viewport-dimensions.html: >+ * fast/visual-viewport/visual-viewport-same-object.html: >+ * fast/visual-viewport/zoomed-fixed-header-and-footer.html: >+ * fast/visual-viewport/zoomed-fixed-scroll-down-then-up.html: >+ * fast/visual-viewport/zoomed-fixed.html: >+ * fast/visual-viewport/zoomed-rects.html: >+ * fast/visual-viewport/zoomed-scroll-into-view-fixed.html: >+ * fast/visual-viewport/zoomed-scroll-to-anchor-in-position-fixed.html: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt: >+ * platform/ios-wk2/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt: >+ * scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt: >+ * scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt: >+ * scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt: >+ * scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt: >+ * scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt: >+ * scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt: >+ * scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt: >+ * scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt: >+ * scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt: >+ * scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt: >+ * scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt: >+ * scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt: >+ * scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt: >+ * scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt: >+ * scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt: >+ * scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling.html: Don't insert the first scrolling tree >+ dump until the end, to avoid it affecting main frame height before we get the second layer tree. >+ * tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt: >+ * tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt: >+ * tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt: >+ * tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt: >+ * tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt: >+ * tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt: >+ * tiled-drawing/scrolling/fixed/four-bars-expected.txt: >+ * tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt: >+ * tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt: >+ * tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt: >+ * tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt: >+ * tiled-drawing/scrolling/fixed/nested-fixed-expected.txt: >+ * tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt: >+ * tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt: >+ * tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt: >+ * tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt: >+ * tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt: >+ * tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt: >+ * tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt: >+ > 2019-02-20 Dean Jackson <dino@apple.com> > > Rotation animations sometimes use the wrong origin (affects apple.com) >diff --git a/LayoutTests/fast/dom/elementFromPoint-scaled-scrolled-layout-viewport.html b/LayoutTests/fast/dom/elementFromPoint-scaled-scrolled-layout-viewport.html >index 5b936a5ccf04c4c10147424ee5334b489b65d22f..355504a2195534eca5369fb3e0cba1bf6bf91e7f 100644 >--- a/LayoutTests/fast/dom/elementFromPoint-scaled-scrolled-layout-viewport.html >+++ b/LayoutTests/fast/dom/elementFromPoint-scaled-scrolled-layout-viewport.html >@@ -29,7 +29,6 @@ > function runTest() { > description("This test applies page scale and scrolls the page, and checks that elementFromPoint returns the correct element."); > if (window.internals) { >- window.internals.settings.setVisualViewportEnabled(true); > window.internals.settings.setClientCoordinatesRelativeToLayoutViewport(true); > window.internals.setPageScaleFactor(2, 0, 0); > } >diff --git a/LayoutTests/fast/events/ios/rotation/resources/rotation-utils.js b/LayoutTests/fast/events/ios/rotation/resources/rotation-utils.js >index a639eef4ff84394a5c98bec550ccd73e219f5be0..b623b8a654baae6d4c9ee8e9783e6497918a184c 100644 >--- a/LayoutTests/fast/events/ios/rotation/resources/rotation-utils.js >+++ b/LayoutTests/fast/events/ios/rotation/resources/rotation-utils.js >@@ -1,8 +1,5 @@ > jsTestIsAsync = true; > >-if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > function stringFromRect(domRect) > { > return `${domRect.x}, ${domRect.y} - ${domRect.width} x ${domRect.height}`; >diff --git a/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-expected.txt b/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-expected.txt >index 1353a0a32a6150c84e41a497194e21807395d344..aa1858af91073db60f343ee49ca6374c104c4277 100644 >--- a/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-expected.txt >+++ b/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-expected.txt >@@ -148,7 +148,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >diff --git a/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-nested-expected.txt b/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-nested-expected.txt >index 60572d383dfecfdcb9749c3ee06bfa38dd9f3c01..05bd15b33d20cc3686a2609c05031d0ccdf38c7d 100644 >--- a/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-nested-expected.txt >+++ b/LayoutTests/fast/scrolling/ios/change-scrollability-on-content-resize-nested-expected.txt >@@ -73,7 +73,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >diff --git a/LayoutTests/fast/visual-viewport/client-coordinates-relative-to-layout-viewport.html b/LayoutTests/fast/visual-viewport/client-coordinates-relative-to-layout-viewport.html >index 73ed3238bf8e9d62e98b8de55bcf597f5913a561..262efcc7c9e92a5d5dccac166c8735e2491d839d 100644 >--- a/LayoutTests/fast/visual-viewport/client-coordinates-relative-to-layout-viewport.html >+++ b/LayoutTests/fast/visual-viewport/client-coordinates-relative-to-layout-viewport.html >@@ -43,9 +43,6 @@ > if (window.testRunner) > testRunner.waitUntilDone(); > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > function getUIScript() > { > return `(function() { >diff --git a/LayoutTests/fast/visual-viewport/client-rects-relative-to-layout-viewport-zoomed.html b/LayoutTests/fast/visual-viewport/client-rects-relative-to-layout-viewport-zoomed.html >index f9217bf684aca55b25dcb8cccd0a25730c845201..8c3c7e552f998b9596a90fde4e75f163c6fc7b30 100644 >--- a/LayoutTests/fast/visual-viewport/client-rects-relative-to-layout-viewport-zoomed.html >+++ b/LayoutTests/fast/visual-viewport/client-rects-relative-to-layout-viewport-zoomed.html >@@ -28,9 +28,6 @@ > <script> > description("This test zooms and scrolls the page and checks that client rects are correct."); > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > window.jsTestIsAsync = true; > > function stringFromRect(domRect) >diff --git a/LayoutTests/fast/visual-viewport/client-rects-relative-to-layout-viewport.html b/LayoutTests/fast/visual-viewport/client-rects-relative-to-layout-viewport.html >index 6ad520ae634094ae3d0bfebaafbdf2ef2050d89d..328e35eb216546ce14f51135cf6630f21708af24 100644 >--- a/LayoutTests/fast/visual-viewport/client-rects-relative-to-layout-viewport.html >+++ b/LayoutTests/fast/visual-viewport/client-rects-relative-to-layout-viewport.html >@@ -28,9 +28,6 @@ > <script> > description("This test zooms and scrolls the page and checks that client rects are correct."); > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > window.jsTestIsAsync = true; > > function stringFromRect(domRect) >diff --git a/LayoutTests/fast/visual-viewport/nonzoomed-rects.html b/LayoutTests/fast/visual-viewport/nonzoomed-rects.html >index fd32a071e5b3dd5e35cc82d82aba88919ac8e55e..b92238470480085d3c32e3d3d2813f45214f9546 100644 >--- a/LayoutTests/fast/visual-viewport/nonzoomed-rects.html >+++ b/LayoutTests/fast/visual-viewport/nonzoomed-rects.html >@@ -12,9 +12,6 @@ > <script> > description("This test scrolls the page and checks that the layout and visual viewports respond as expected."); > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > window.jsTestIsAsync = true; > > function doTest() >diff --git a/LayoutTests/fast/visual-viewport/resize-event-fired-window-resized.html b/LayoutTests/fast/visual-viewport/resize-event-fired-window-resized.html >index 92c2b5a2a6243f6795b142aa27394160ca1fdb75..ebcc820ef7130650960543215961a3b5121859ce 100644 >--- a/LayoutTests/fast/visual-viewport/resize-event-fired-window-resized.html >+++ b/LayoutTests/fast/visual-viewport/resize-event-fired-window-resized.html >@@ -2,9 +2,6 @@ > <script src="../../resources/testharness.js"></script> > <script src="../../resources/testharnessreport.js"></script> > <script> >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > var test = async_test('Verify that a resize event gets fired when the window is resized.'); > > function resizeHandler() { >diff --git a/LayoutTests/fast/visual-viewport/resize-event-fired.html b/LayoutTests/fast/visual-viewport/resize-event-fired.html >index 7b49531977aef26a30a8e3dc13149cd0b8cad611..6c408446e45e47886c381b7de570f9707648f733 100644 >--- a/LayoutTests/fast/visual-viewport/resize-event-fired.html >+++ b/LayoutTests/fast/visual-viewport/resize-event-fired.html >@@ -11,9 +11,6 @@ > <script> > var pageScaleFactor = 2; > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > var test = async_test('Verify a resize event gets fired on window.visualViewport after pinch-zoom'); > > var resizeDone = false; >diff --git a/LayoutTests/fast/visual-viewport/rtl-nonzoomed-rects.html b/LayoutTests/fast/visual-viewport/rtl-nonzoomed-rects.html >index a768c5ba7b9f623bbaaf66a7115758e234f5eb5a..dde977411b2fa027abf6d847e38217aa9e2dabeb 100644 >--- a/LayoutTests/fast/visual-viewport/rtl-nonzoomed-rects.html >+++ b/LayoutTests/fast/visual-viewport/rtl-nonzoomed-rects.html >@@ -12,9 +12,6 @@ > <script> > description("This test scrolls the page and checks that the layout and visual viewports respond as expected."); > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > window.jsTestIsAsync = true; > > function doTest() >diff --git a/LayoutTests/fast/visual-viewport/rtl-zoomed-rects.html b/LayoutTests/fast/visual-viewport/rtl-zoomed-rects.html >index f5ba780e86e7734c908e3c35122a66760cf73735..091bf4c34296a471b72f400c40310f2d3b018502 100644 >--- a/LayoutTests/fast/visual-viewport/rtl-zoomed-rects.html >+++ b/LayoutTests/fast/visual-viewport/rtl-zoomed-rects.html >@@ -12,9 +12,6 @@ > <script> > description("This test zooms and scrolls the page and checks that the layout and visual viewports respond as expected."); > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > window.jsTestIsAsync = true; > > function doAfterZooming() >diff --git a/LayoutTests/fast/visual-viewport/rubberbanding-viewport-rects-extended-background.html b/LayoutTests/fast/visual-viewport/rubberbanding-viewport-rects-extended-background.html >index e20e941dc459c9fbd0d335c52d62f8438d33158b..d3cd294a66b0a933c09341232b176c07a4627fdf 100644 >--- a/LayoutTests/fast/visual-viewport/rubberbanding-viewport-rects-extended-background.html >+++ b/LayoutTests/fast/visual-viewport/rubberbanding-viewport-rects-extended-background.html >@@ -13,7 +13,6 @@ > description("This test scrolls the page with extended backgrounds enabled and checks that the layout and visual viewports respond as expected."); > > if (window.internals) { >- internals.settings.setVisualViewportEnabled(true); > internals.settings.setAllowUnclampedScrollPosition(true); > internals.settings.setBackgroundShouldExtendBeyondPage(true); > } >diff --git a/LayoutTests/fast/visual-viewport/rubberbanding-viewport-rects-header-footer.html b/LayoutTests/fast/visual-viewport/rubberbanding-viewport-rects-header-footer.html >index 4e7f257930042526cf259d8cf4591cf5a3d503a9..094ce49d3ae2bacb1be0521a858c84876971f09b 100644 >--- a/LayoutTests/fast/visual-viewport/rubberbanding-viewport-rects-header-footer.html >+++ b/LayoutTests/fast/visual-viewport/rubberbanding-viewport-rects-header-footer.html >@@ -13,7 +13,6 @@ > description("This test scrolls the page and checks that the layout and visual viewports respond as expected."); > > if (window.internals) { >- internals.settings.setVisualViewportEnabled(true); > internals.settings.setAllowUnclampedScrollPosition(true); > internals.setHeaderHeight(52); > internals.setFooterHeight(43); >diff --git a/LayoutTests/fast/visual-viewport/rubberbanding-viewport-rects.html b/LayoutTests/fast/visual-viewport/rubberbanding-viewport-rects.html >index b1c94cfa2a86823bec30c82236349a27c27fdcba..984fcf0a1cfd3a83578b7b9c26b5c8c4090e9afa 100644 >--- a/LayoutTests/fast/visual-viewport/rubberbanding-viewport-rects.html >+++ b/LayoutTests/fast/visual-viewport/rubberbanding-viewport-rects.html >@@ -12,10 +12,8 @@ > <script> > description("This test scrolls the page and checks that the layout and visual viewports respond as expected."); > >- if (window.internals) { >- internals.settings.setVisualViewportEnabled(true); >+ if (window.internals) > internals.settings.setAllowUnclampedScrollPosition(true); >- } > > window.jsTestIsAsync = true; > >diff --git a/LayoutTests/fast/visual-viewport/scroll-event-fired.html b/LayoutTests/fast/visual-viewport/scroll-event-fired.html >index e00db021f640cac2415234d4cdfae7a30f8204c5..d468d66e48c9739e3bab4d76c9798be29748aceb 100644 >--- a/LayoutTests/fast/visual-viewport/scroll-event-fired.html >+++ b/LayoutTests/fast/visual-viewport/scroll-event-fired.html >@@ -11,9 +11,6 @@ > <script> > var pageScaleFactor = 2; > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > var test = async_test('Verify that a scroll event gets fired on window.visualViewport when its offset changes'); > > function scrollEventHandler() { >diff --git a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt >index 22ca548b990f6e5f5f5462b6a62ccd263c1693b3..391b8de54a6af7fffccc9c91db78b2a4b5f70b41 100644 >--- a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt >+++ b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-expected.txt >@@ -13,7 +13,6 @@ > (has enabled horizontal scrollbar 1) > (has enabled vertical scrollbar 1)) > (frame scale factor 2.00) >- (visual viewport enabled 1) > (layout viewport at (0,207.50) size 785x585) > (min layout viewport origin (0,0)) > (max layout viewport origin (1223,1436)) >diff --git a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt >index 1b3965f2e54e12d7d4c6f4288e2589b249846d06..ec399b0c5916ca5f26c7e2d5dcb1c661fd055c67 100644 >--- a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt >+++ b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up-expected.txt >@@ -13,7 +13,6 @@ > (has enabled horizontal scrollbar 1) > (has enabled vertical scrollbar 1)) > (frame scale factor 2.00) >- (visual viewport enabled 1) > (layout viewport at (0,230) size 785x585) > (min layout viewport origin (0,0)) > (max layout viewport origin (1223,1436)) >diff --git a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up.html b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up.html >index 0143c60c7b1ec401445885c98ca170a3c9ee4a59..5f00f4a1ed574e69ce0b50399632b75b0835c6d0 100644 >--- a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up.html >+++ b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down-then-up.html >@@ -37,9 +37,6 @@ > testRunner.waitUntilDone(); > } > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > function doAfterZooming() > { > window.scrollTo(20, 875); >diff --git a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down.html b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down.html >index 9f7466c42fbb51f1f5ba3606901c47735436fc58..b62fd3e5e38c6ef11e05a6c29dbb331911bca5aa 100644 >--- a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down.html >+++ b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolled-down.html >@@ -37,9 +37,6 @@ > testRunner.waitUntilDone(); > } > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > function doAfterZooming() > { > window.scrollTo(20, 500); >diff --git a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt >index 3f20e5a14274bfcda594d3545d3b4342dac51cad..21250df1fbd92e4a525eadb1f8962bb3d1080d14 100644 >--- a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt >+++ b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state-expected.txt >@@ -11,7 +11,6 @@ > (has enabled horizontal scrollbar 1) > (has enabled vertical scrollbar 1)) > (frame scale factor 2.00) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x585) > (min layout viewport origin (0,0)) > (max layout viewport origin (1223,1436)) >diff --git a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state.html b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state.html >index 39705301a7f1c760b1f0d9969f37827fbfa6a032..1c024bf2175dbdd5b87484a041a221fcf8401637 100644 >--- a/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state.html >+++ b/LayoutTests/fast/visual-viewport/tiled-drawing/zoomed-fixed-scrolling-layers-state.html >@@ -37,9 +37,6 @@ > testRunner.waitUntilDone(); > } > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > function doAfterZooming() > { > // Zooming may scroll the view away from the origin. >diff --git a/LayoutTests/fast/visual-viewport/viewport-dimensions-exclude-custom-scrollbars.html b/LayoutTests/fast/visual-viewport/viewport-dimensions-exclude-custom-scrollbars.html >index 163c401baaec22b0f0f53bd941f3fd6b8052a6b1..935ec2a2399d9850ae8afc6fb3cb7dd53ebd56f7 100644 >--- a/LayoutTests/fast/visual-viewport/viewport-dimensions-exclude-custom-scrollbars.html >+++ b/LayoutTests/fast/visual-viewport/viewport-dimensions-exclude-custom-scrollbars.html >@@ -25,9 +25,6 @@ > var pageScaleFactor = 2; > var scrollbarThicknessInCSSPixels; > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > function viewport() { > return window.visualViewport; > } >diff --git a/LayoutTests/fast/visual-viewport/viewport-dimensions-exclude-scrollbars.html b/LayoutTests/fast/visual-viewport/viewport-dimensions-exclude-scrollbars.html >index 1b58f198410b0cb6a74e0a5e71d0fe864bd728c0..5e0b1e207b42104d6e17059a33264f2748b24040 100644 >--- a/LayoutTests/fast/visual-viewport/viewport-dimensions-exclude-scrollbars.html >+++ b/LayoutTests/fast/visual-viewport/viewport-dimensions-exclude-scrollbars.html >@@ -12,9 +12,6 @@ > var pageScaleFactor = 2; > var scrollbarThicknessInCSSPixels; > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > function viewport() { > return window.visualViewport; > } >diff --git a/LayoutTests/fast/visual-viewport/viewport-dimensions-iframe.html b/LayoutTests/fast/visual-viewport/viewport-dimensions-iframe.html >index e287aaea20bacc29df9227ca271f561942eca275..32a4303e7d80d9bb433db7a280cc95593a1a6db3 100644 >--- a/LayoutTests/fast/visual-viewport/viewport-dimensions-iframe.html >+++ b/LayoutTests/fast/visual-viewport/viewport-dimensions-iframe.html >@@ -15,9 +15,6 @@ > var pageScaleFactor = 2; > var scrollbarThicknessInCSSPixels; > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > function frameViewport() { > var frame = document.getElementById("frame"); > return frame.contentWindow.visualViewport; >diff --git a/LayoutTests/fast/visual-viewport/viewport-dimensions-under-page-zoom.html b/LayoutTests/fast/visual-viewport/viewport-dimensions-under-page-zoom.html >index b50b11d76abc5608f1ba7f71a1c522925254fc0b..a266fcb80f81f2ee17f1ee9f067097e1934df5a1 100644 >--- a/LayoutTests/fast/visual-viewport/viewport-dimensions-under-page-zoom.html >+++ b/LayoutTests/fast/visual-viewport/viewport-dimensions-under-page-zoom.html >@@ -12,9 +12,6 @@ > var pageZoomFactor = 2; > var scrollbarThicknessInCSSPixels; > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > function viewport() { > return window.visualViewport; > } >diff --git a/LayoutTests/fast/visual-viewport/viewport-dimensions.html b/LayoutTests/fast/visual-viewport/viewport-dimensions.html >index f5333302de09695bc565aef8ab19ec5ac17f61e4..d9be25cf620e55a9cf4d2543711a18ab23fa5129 100644 >--- a/LayoutTests/fast/visual-viewport/viewport-dimensions.html >+++ b/LayoutTests/fast/visual-viewport/viewport-dimensions.html >@@ -13,9 +13,6 @@ > var pageScaleFactor = 2; > var scrollbarThicknessInCSSPixels; > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > function viewport() { > return window.visualViewport; > } >diff --git a/LayoutTests/fast/visual-viewport/visual-viewport-same-object.html b/LayoutTests/fast/visual-viewport/visual-viewport-same-object.html >index c641a24a1e7a3ba47e5b981ff2a5fa4987c3cf74..f34deef767638cbb6d8a8223387f2e2e0bee854a 100644 >--- a/LayoutTests/fast/visual-viewport/visual-viewport-same-object.html >+++ b/LayoutTests/fast/visual-viewport/visual-viewport-same-object.html >@@ -3,9 +3,6 @@ > <script src="../../resources/testharnessreport.js"></script> > <script src="../../resources/gc.js"></script> > <script> >-if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > test(() => { > window.visualViewport.newValue = 23; > gc(); >diff --git a/LayoutTests/fast/visual-viewport/zoomed-fixed-header-and-footer.html b/LayoutTests/fast/visual-viewport/zoomed-fixed-header-and-footer.html >index 3b78951fc6f9766e517fb20da7ed74a11ba16017..400ac663ff6d230211fafe409a3231bca5ae594c 100644 >--- a/LayoutTests/fast/visual-viewport/zoomed-fixed-header-and-footer.html >+++ b/LayoutTests/fast/visual-viewport/zoomed-fixed-header-and-footer.html >@@ -38,7 +38,6 @@ > if (window.internals) { > internals.setHeaderHeight(43); > internals.setFooterHeight(56); >- internals.settings.setVisualViewportEnabled(true); > } > > window.jsTestIsAsync = true; >diff --git a/LayoutTests/fast/visual-viewport/zoomed-fixed-scroll-down-then-up.html b/LayoutTests/fast/visual-viewport/zoomed-fixed-scroll-down-then-up.html >index 4b4d3cecaf1863b17f9a97270589faee566cda15..002241acb2fe3d8a256dcf972b8e03dce08a0dbd 100644 >--- a/LayoutTests/fast/visual-viewport/zoomed-fixed-scroll-down-then-up.html >+++ b/LayoutTests/fast/visual-viewport/zoomed-fixed-scroll-down-then-up.html >@@ -35,9 +35,6 @@ > if (window.testRunner) > testRunner.waitUntilDone(); > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > function doAfterZooming() > { > window.scrollTo(275, 525); >diff --git a/LayoutTests/fast/visual-viewport/zoomed-fixed.html b/LayoutTests/fast/visual-viewport/zoomed-fixed.html >index c7a003f4c97e7467af4fabf9b4de60fb87a8ae52..f0b9ecd0feab2dbe0fa6b27009848dcd88607f13 100644 >--- a/LayoutTests/fast/visual-viewport/zoomed-fixed.html >+++ b/LayoutTests/fast/visual-viewport/zoomed-fixed.html >@@ -35,9 +35,6 @@ > <script> > description("This test zooms and scrolls the page and checks the positions of fixed-position objects."); > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > window.jsTestIsAsync = true; > > var fixedElement; >diff --git a/LayoutTests/fast/visual-viewport/zoomed-rects.html b/LayoutTests/fast/visual-viewport/zoomed-rects.html >index 553566816b27ee8a6f0be54ff019ed0b0b9f8a47..fcc13ff3c9b76b25a6bd1eab15536730bc008213 100644 >--- a/LayoutTests/fast/visual-viewport/zoomed-rects.html >+++ b/LayoutTests/fast/visual-viewport/zoomed-rects.html >@@ -12,9 +12,6 @@ > <script> > description("This test zooms and scrolls the page and checks that the layout and visual viewports respond as expected."); > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > window.jsTestIsAsync = true; > > function doAfterZooming() >diff --git a/LayoutTests/fast/visual-viewport/zoomed-scroll-into-view-fixed.html b/LayoutTests/fast/visual-viewport/zoomed-scroll-into-view-fixed.html >index a6cb54b5308a114a42632a1179658317a83eb8f6..17f7a61ff2b2660b32513e071ab3de9f8eb6f04c 100644 >--- a/LayoutTests/fast/visual-viewport/zoomed-scroll-into-view-fixed.html >+++ b/LayoutTests/fast/visual-viewport/zoomed-scroll-into-view-fixed.html >@@ -56,9 +56,6 @@ > <script src="../../resources/js-test-pre.js"></script> > <script> > >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > description("Tests revealing elements inside position:fixed after zooming."); > > window.jsTestIsAsync = true; >diff --git a/LayoutTests/fast/visual-viewport/zoomed-scroll-to-anchor-in-position-fixed.html b/LayoutTests/fast/visual-viewport/zoomed-scroll-to-anchor-in-position-fixed.html >index ba24b914be81b9cc980286c3e04daa8c511dd585..49f9c1b79a4efe9ea2ade0019f485b1fceb0a3be 100644 >--- a/LayoutTests/fast/visual-viewport/zoomed-scroll-to-anchor-in-position-fixed.html >+++ b/LayoutTests/fast/visual-viewport/zoomed-scroll-to-anchor-in-position-fixed.html >@@ -16,10 +16,6 @@ > </style> > <script src="../../resources/js-test-pre.js"></script> > <script> >- >- if (window.internals) >- internals.settings.setVisualViewportEnabled(true); >- > description("Tests scrolling to an anchor inside position:fixed after zooming doesn't try to scroll the page"); > > window.jsTestIsAsync = true; >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt >index e5a76e78040ae0ab7c2624491031662d7d832907..5339eb23141cc2fca1c0aa1219e5b3d1707601a0 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt >@@ -8,7 +8,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,416)) >@@ -26,7 +25,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 500x300) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,120)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt >index 3e2c9c75d69b1c7c6f5a79300914bc83ee00de98..d40172f9ec37b5ef9d935d15a543dcbe01d23e13 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt >@@ -8,7 +8,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,416)) >@@ -31,7 +30,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 1) > (vertical scrollbar mode 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 500x300) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,120)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt >index 1609cae4197d44ed937ae7d8771de3e365c06d84..4cd5d2bcef97f131fafdf925eb12cbbc921833f2 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt >@@ -8,7 +8,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,416)) >@@ -31,7 +30,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 500x300) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,120)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt >index f80a475af7b68d5e249e1905d57cc4566e33cfe8..14620b74a661df8ee12ba4635a26a2fec7e18c96 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt >@@ -8,7 +8,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,416)) >@@ -26,7 +25,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 1) > (vertical scrollbar mode 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 500x300) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,120)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >index 9db90e55ca2d2ee2e86b919f309b4a00f19ba990..1e6ed8b4ec90632f1914de7d4a752b28f845e736 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >@@ -9,7 +9,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,57)) >@@ -29,7 +28,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,120) size 480x400) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,616)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt >index 5fc7fa011e0efad849e1d39dd2b2ae0efc7959d5..2f15ddce57719c4fa193844d7afd534973f901dd 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt >@@ -11,7 +11,6 @@ Inner scrolling content > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt >index 5fc7fa011e0efad849e1d39dd2b2ae0efc7959d5..2f15ddce57719c4fa193844d7afd534973f901dd 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt >@@ -11,7 +11,6 @@ Inner scrolling content > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt >index 8abfcb9004d003fe700666ece6d6873024380ee4..79ad9c61cfd17d3900b358ba57f22df7fa2846ce 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt >@@ -9,7 +9,6 @@ Scrolling content > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt >index 7a4439241e545618256578592479466a29592d16..6c04b473a679ec85294590b5ca6179e7fd4011ca 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt >@@ -8,7 +8,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,416)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt >index bb7951a1c6711ed5fbab09fb8d42f3712f73a8c5..72250e9154225ff93456935ab052df181d92421d 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt >@@ -8,7 +8,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,1913)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt >index 1843ab3c65438bf05cd180687f0a1cdd2d85c698..17bb70d75c5cbcfc0cb504a347813aa9e5cb2b72 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt >@@ -11,7 +11,6 @@ Inner scrolling content > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt >index 485f56829bbbb0fd30445e0bd4716b0cfb717531..da3973efd4a0bb23a50f36b79c5acf38fcac4b62 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt >@@ -11,7 +11,6 @@ Inner scrolling content > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,441)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt >index acd7100f58bf12c4c409b960c8141cd20e66af9c..ca445b3ce65d684384e07ddc64300c0a2c7c88e3 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt >@@ -9,7 +9,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >@@ -27,7 +26,6 @@ > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 100x200) > (min layout viewport origin (0,0)) > (max layout viewport origin (208,216)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt >index b0e3c0b075346ee8d8cbe65c9d62b8277fb49b39..58656f68b11db6b01b0a71e12d3e02cfe1c388b5 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt >@@ -9,7 +9,6 @@ FirstSecondThird > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >diff --git a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt >index 731282f12f6186479b3075d360be38bed9b72f56..76ff8bd92ce0ff6256deb23e56cfd63f1fd2f312 100644 >--- a/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt >+++ b/LayoutTests/platform/ios-wk2/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt >@@ -11,7 +11,6 @@ Scrolling tree on non-scrollable > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,45)) >@@ -22,17 +21,16 @@ Scrolling tree on non-scrollable > (children 1 > (Frame scrolling node > (scrollable area size 600 500) >- (contents size 600 1024) >+ (contents size 600 500) > (parent relative scrollable rect at (0,0) size 600x500) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 600x500) > (min layout viewport origin (0,0)) >- (max layout viewport origin (0,524)) >+ (max layout viewport origin (0,0)) > (behavior for fixed 0) > (children 1 > (Frame hosting node >@@ -47,7 +45,6 @@ Scrolling tree on non-scrollable > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 500x400) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,624)) >@@ -67,17 +64,16 @@ Scrolling tree on scrollable > > (Frame scrolling node > (scrollable area size 800 600) >- (contents size 800 1515) >+ (contents size 800 645) > (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) >- (max layout viewport origin (0,915)) >+ (max layout viewport origin (0,45)) > (behavior for fixed 0) > (children 1 > (Frame hosting node >@@ -85,17 +81,16 @@ Scrolling tree on scrollable > (children 1 > (Frame scrolling node > (scrollable area size 600 500) >- (contents size 600 500) >+ (contents size 600 1024) > (parent relative scrollable rect at (0,0) size 600x500) > (scrollable area parameters > (horizontal scroll elasticity 1) > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 600x500) > (min layout viewport origin (0,0)) >- (max layout viewport origin (0,0)) >+ (max layout viewport origin (0,524)) > (behavior for fixed 0) > (children 1 > (Frame hosting node >@@ -110,7 +105,6 @@ Scrolling tree on scrollable > (vertical scroll elasticity 1) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 500x400) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,624)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt >index 0e4fe25bb1714a186b7888b135d3eb6348223dbf..042dd1bc3e3d87e9b26dab93f0f74ff95593f2c7 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-expected.txt >@@ -9,7 +9,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,416)) >@@ -30,7 +29,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 485x300) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,120)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt >index 88fde808f4d9ee93bbde5c1bb18d797fe8e7fc16..fd1691d99f9f5ab66a1a804115af45700f25ac3a 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-gain-scrolling-ancestor-expected.txt >@@ -9,7 +9,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,416)) >@@ -34,7 +33,6 @@ > (vertical scroll elasticity 0) > (horizontal scrollbar mode 1) > (vertical scrollbar mode 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 500x300) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,120)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt >index beaff96fd3445cfe091f5354c1776615060accae..42aecb08bfc397a43d080dc1fdd58b8ee2985dc9 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-in-fixed-expected.txt >@@ -9,7 +9,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,416)) >@@ -35,7 +34,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 485x300) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,120)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt >index 143134af8f42bba6bd04a502ca191777d5231dc1..797508d24e60cfc41e9c9be096b7c06dba17b177 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/coordinated-frame-lose-scrolling-ancestor-expected.txt >@@ -9,7 +9,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,416)) >@@ -29,7 +28,6 @@ > (vertical scroll elasticity 0) > (horizontal scrollbar mode 1) > (vertical scrollbar mode 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 500x300) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,120)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >index daa30499a555267ae8119daf77dd77b0cccddcff..0e625ad02158480f51ae3d5b8f397201958b3e33 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/fixed-inside-frame-expected.txt >@@ -10,7 +10,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,57)) >@@ -31,7 +30,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,120) size 465x400) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,616)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt >index 18c26fae34842140d0aa07f377dfdaa6ffb7ca0f..3ca6a74a07ccf8f92663b45b4f4e046de783d423 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/gain-scrolling-node-parent-expected.txt >@@ -11,7 +11,6 @@ Inner scrolling content > (vertical scroll elasticity 2) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt >index 18c26fae34842140d0aa07f377dfdaa6ffb7ca0f..3ca6a74a07ccf8f92663b45b4f4e046de783d423 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/lose-scrolling-node-parent-expected.txt >@@ -11,7 +11,6 @@ Inner scrolling content > (vertical scroll elasticity 2) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt >index ca3c47f5ad01244cbc15d7ee8ed5bfbef023d72e..15f9b99b3bec2a40fe5835f849523bbe74c7df4b 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/overflow-in-fixed-expected.txt >@@ -9,7 +9,6 @@ Scrolling content > (vertical scroll elasticity 2) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt >index 96234027afa800605d0b32ac192d50e8fb4cd7cf..d18a44abd973cd5a4b2c7950e219e7abf342f6c8 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-coordinated-frame-expected.txt >@@ -9,7 +9,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,416)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt >index 575858ceb663198bff176570fa11b83e85106b1d..2b07022533298d78ad0de989fb3587ba08536074 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/remove-scrolling-role-expected.txt >@@ -9,7 +9,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,1913)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt >index 6c17932685c4230b32e32d78c9107896e8776978..d96c3d24b69b61615f3042cabb730222337c56c5 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-across-compositing-layers-expected.txt >@@ -11,7 +11,6 @@ Inner scrolling content > (vertical scroll elasticity 2) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt >index d2f664ba9bfbe06b3109d2ac45cd3ebaea63a436..2babd2ce6da8a2cf2444abb8d0fab7a26b1fd2ab 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/reparent-with-layer-removal-expected.txt >@@ -12,7 +12,6 @@ Inner scrolling content > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,441)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/resources/scroll-toggling-frame.html b/LayoutTests/scrollingcoordinator/scrolling-tree/resources/scroll-toggling-frame.html >index a0d4da4ee455a6888ce5fe45210279a8c7f6c052..8e7d17815350f8d321fe9bd2c6b907a40d311606 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/resources/scroll-toggling-frame.html >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/resources/scroll-toggling-frame.html >@@ -20,10 +20,12 @@ > window.addEventListener('load', () => { > requestAnimationFrame(() => { > document.body.classList.add('changed'); >+ document.body.offsetWidth; > parent.subFrameBecameNonScrollable(); > > requestAnimationFrame(() => { > document.body.classList.remove('changed'); >+ document.body.offsetWidth; > parent.subFrameBecameScrollable(); > }); > }); >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt >index 51a795108053e196c371286f194c2d53d0393715..2bde8ae7dfea04c74ee3d37e7f676e61be68c0aa 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-includes-frame-expected.txt >@@ -9,7 +9,6 @@ > (vertical scroll elasticity 2) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >@@ -29,7 +28,6 @@ > (vertical scrollbar mode 0) > (has enabled horizontal scrollbar 1) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 85x185) > (min layout viewport origin (0,0)) > (max layout viewport origin (223,231)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt >index 7a30992215b3d1776151c6b1c0310548f222b492..84644f1e0d348039b6bfb5e80ad2b35303df0606 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/scrolling-tree-is-z-order-expected.txt >@@ -9,7 +9,6 @@ FirstSecondThird > (vertical scroll elasticity 2) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt b/LayoutTests/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt >index f1a58cda1ff511a317096d1e8468ac1c7d2e1bf4..49c98e2fb08a89c8482343ed3c5503158394062b 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling-expected.txt >@@ -12,7 +12,6 @@ Scrolling tree on non-scrollable > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,40)) >@@ -22,19 +21,17 @@ Scrolling tree on non-scrollable > (parent relative scrollable rect at (30,30) size 600x500) > (children 1 > (Frame scrolling node >- (scrollable area size 585 500) >- (contents size 585 1024) >+ (scrollable area size 600 500) >+ (contents size 600 500) > (parent relative scrollable rect at (0,0) size 600x500) > (scrollable area parameters > (horizontal scroll elasticity 0) > (vertical scroll elasticity 0) > (horizontal scrollbar mode 0) >- (vertical scrollbar mode 0) >- (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) >- (layout viewport at (0,0) size 585x500) >+ (vertical scrollbar mode 0)) >+ (layout viewport at (0,0) size 600x500) > (min layout viewport origin (0,0)) >- (max layout viewport origin (0,524)) >+ (max layout viewport origin (0,0)) > (behavior for fixed 0) > (children 1 > (Frame hosting node >@@ -50,7 +47,6 @@ Scrolling tree on non-scrollable > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 485x400) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,624)) >@@ -70,7 +66,7 @@ Scrolling tree on scrollable > > (Frame scrolling node > (scrollable area size 785 600) >- (contents size 785 1616) >+ (contents size 785 640) > (parent relative scrollable rect at (0,0) size 800x600) > (scrollable area parameters > (horizontal scroll elasticity 2) >@@ -78,28 +74,27 @@ Scrolling tree on scrollable > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) >- (max layout viewport origin (0,1016)) >+ (max layout viewport origin (0,40)) > (behavior for fixed 0) > (children 1 > (Frame hosting node > (parent relative scrollable rect at (30,30) size 600x500) > (children 1 > (Frame scrolling node >- (scrollable area size 600 500) >- (contents size 600 500) >+ (scrollable area size 585 500) >+ (contents size 585 1024) > (parent relative scrollable rect at (0,0) size 600x500) > (scrollable area parameters > (horizontal scroll elasticity 0) > (vertical scroll elasticity 0) > (horizontal scrollbar mode 0) >- (vertical scrollbar mode 0)) >- (visual viewport enabled 1) >- (layout viewport at (0,0) size 600x500) >+ (vertical scrollbar mode 0) >+ (has enabled vertical scrollbar 1)) >+ (layout viewport at (0,0) size 585x500) > (min layout viewport origin (0,0)) >- (max layout viewport origin (0,0)) >+ (max layout viewport origin (0,524)) > (behavior for fixed 0) > (children 1 > (Frame hosting node >@@ -115,7 +110,6 @@ Scrolling tree on scrollable > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 485x400) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,624)) >diff --git a/LayoutTests/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling.html b/LayoutTests/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling.html >index d043bb39fd2ebe2ec130becec3762dfa2f9fe6d4..ff1ebfef1d800c81a1aaedb7573e2dca44ee5ba4 100644 >--- a/LayoutTests/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling.html >+++ b/LayoutTests/scrollingcoordinator/scrolling-tree/toggle-coordinated-frame-scrolling.html >@@ -11,16 +11,22 @@ > if (window.internals) > window.internals.settings.setAsyncFrameScrollingEnabled(true); > >+ var firstScrollingTree = ""; >+ var secondScrollingTree = ""; >+ > function subFrameBecameNonScrollable() > { > if (window.internals) >- document.getElementById('scrollingTree1').innerText = window.internals.scrollingStateTreeAsText() + "\n"; >+ firstScrollingTree = window.internals.scrollingStateTreeAsText() + "\n"; > } > > function subFrameBecameScrollable() > { > if (window.internals) >- document.getElementById('scrollingTree2').innerText = window.internals.scrollingStateTreeAsText() + "\n"; >+ secondScrollingTree = window.internals.scrollingStateTreeAsText() + "\n"; >+ >+ document.getElementById('scrollingTree1').innerText = firstScrollingTree; >+ document.getElementById('scrollingTree2').innerText = secondScrollingTree; > > if (window.testRunner) > testRunner.notifyDone(); >diff --git a/LayoutTests/tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt b/LayoutTests/tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt >index b351ab23030a1984de68c83217b1265483c9fef8..7220573cd0f742289e19519e04d594e7b8faf93b 100644 >--- a/LayoutTests/tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt >@@ -11,7 +11,6 @@ Attempted scroll to -5000, 0 > (vertical scrollbar mode 0) > (has enabled horizontal scrollbar 1) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x585) > (min layout viewport origin (0,0)) > (max layout viewport origin (4223,4436)) >@@ -31,7 +30,6 @@ Attempted scroll to 0, -5000 > (vertical scrollbar mode 0) > (has enabled horizontal scrollbar 1) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x585) > (min layout viewport origin (0,0)) > (max layout viewport origin (4223,4436)) >@@ -51,7 +49,6 @@ Attempted scroll to -5000, -5000 > (vertical scrollbar mode 0) > (has enabled horizontal scrollbar 1) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x585) > (min layout viewport origin (0,0)) > (max layout viewport origin (4223,4436)) >@@ -73,7 +70,6 @@ Attempted scroll to 10000, 0 > (vertical scrollbar mode 0) > (has enabled horizontal scrollbar 1) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x585) > (min layout viewport origin (0,0)) > (max layout viewport origin (4223,4436)) >@@ -95,7 +91,6 @@ Attempted scroll to 0, 10000 > (vertical scrollbar mode 0) > (has enabled horizontal scrollbar 1) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (4223,0) size 785x585) > (min layout viewport origin (0,0)) > (max layout viewport origin (4223,4436)) >@@ -117,7 +112,6 @@ Attempted scroll to 10000, 10000 > (vertical scrollbar mode 0) > (has enabled horizontal scrollbar 1) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,4436) size 785x585) > (min layout viewport origin (0,0)) > (max layout viewport origin (4223,4436)) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt >index 177cb4cb75372dd1b64f23109a87c40f9912f62e..706270d400dd7da87b2a40b267450805e70d9108 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-fixed-expected.txt >@@ -11,7 +11,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,200) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,2110)) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt >index 8c21447ad66d926dd91e0b6b23d0cf24bae8aeed..f71c7364e0ca8312d814fec266ba856bf5412304 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/absolute-inside-out-of-view-fixed-expected.txt >@@ -11,7 +11,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,200) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,1913)) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt >index 0c3c3c9fdc23ffd0550165de36f63f498c9161c5..41c9bbd3e9307ecc3fa1bf32ac5c67c83727bfdc 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/fixed-in-overflow-expected.txt >@@ -11,7 +11,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,200) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,1613)) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt >index 24cdde0496b65038172e7459bec2d92d37c9f279..b4db96f22e91bbffbc2573cb7e8f7b2727aa2734 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-expected.txt >@@ -9,7 +9,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,421)) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt >index 24cdde0496b65038172e7459bec2d92d37c9f279..b4db96f22e91bbffbc2573cb7e8f7b2727aa2734 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/fixed-position-out-of-view-negative-zindex-expected.txt >@@ -9,7 +9,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,421)) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-expected.txt >index 11fa988ca9bf86b9081e53be84f1b43d907b2d22..b5e4e49fcc2efb29cd01b7e5de7624e93d67c418 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-expected.txt >@@ -11,7 +11,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,200) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,1621)) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt >index 168965a864001f27c8eb03bfb9579b3a257db975..a9fd4dcfc917f39e1a5c74038425e035036991d1 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-with-header-and-footer-expected.txt >@@ -13,7 +13,6 @@ > (has enabled vertical scrollbar 1)) > (header height 100) > (footer height 100) >- (visual viewport enabled 1) > (layout viewport at (0,100) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,1621)) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt >index 10ddec0c38059c0f77beb671cd97069516891a8f..5a40c1a9b12fe604a3040760730b898a8b8e2d3c 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/four-bars-zoomed-expected.txt >@@ -10,7 +10,6 @@ > (has enabled horizontal scrollbar 1) > (has enabled vertical scrollbar 1)) > (frame scale factor 2.30) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x585) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,1636)) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt >index 8eba230babe21ebb16bb89e12155da1ff2839ff8..2ca67612eb0a931998c803888fe3389b480f878b 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-expected.txt >@@ -9,7 +9,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,1621)) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt >index c081d0412b9f8805e3d4ac367d2524fed1b0cf4d..f7afd9bf7c91e5b6d65fb0d57495c1b1c1057b3d 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/negative-scroll-offset-in-view-expected.txt >@@ -9,7 +9,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,1621)) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/nested-fixed-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/nested-fixed-expected.txt >index 1e0873dc987aad571e435deec3332ed710dd9ee2..de6259737198837bb3df546a0d79a56fda492bf1 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/nested-fixed-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/nested-fixed-expected.txt >@@ -11,7 +11,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,200) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,1613)) >diff --git a/LayoutTests/tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt b/LayoutTests/tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt >index 98fdb8c13dbc3c1613787c484c3eb694dd39a1d8..53a3a91670b0bdbb09cb52680cc43e66cb525c3f 100644 >--- a/LayoutTests/tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/fixed/percentage-inside-fixed-expected.txt >@@ -11,7 +11,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,200) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,1913)) >diff --git a/LayoutTests/tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt b/LayoutTests/tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt >index f2437bcd73a5c7fb44a6ef2c57b6969612f3821c..e1f0bc076a586cd624fa1d3a4604ef96922bc93e 100644 >--- a/LayoutTests/tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/frames/scroll-region-after-frame-layout-expected.txt >@@ -10,7 +10,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,157)) >diff --git a/LayoutTests/tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt b/LayoutTests/tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt >index 91a966fc571909639607189fc5871fcc63ee21ec..5024b34efc6417a47f95a35f0fc7cdc314476c1a 100644 >--- a/LayoutTests/tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt >@@ -11,7 +11,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,4421)) >diff --git a/LayoutTests/tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt b/LayoutTests/tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt >index 73b51b6a746366b2b898ce7acffc0052aab67835..3ad1a94992005d7d0747792740a974fbc99b5fb3 100644 >--- a/LayoutTests/tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/scrolling-tree-slow-scrolling-expected.txt >@@ -8,7 +8,6 @@ > (vertical scroll elasticity 2) > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 800x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,0)) >diff --git a/LayoutTests/tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt b/LayoutTests/tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt >index 3c297b5cfc6c5b1e4295b25fe38e86c310571c8b..034c04170a6791a440f0a4bd401ea48fd02f5380 100644 >--- a/LayoutTests/tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/sticky/negative-scroll-offset-expected.txt >@@ -9,7 +9,6 @@ > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,0) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,1616)) >diff --git a/LayoutTests/tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt b/LayoutTests/tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt >index c0ed0bd0f54051bcccb0c798725bbbc583651c87..def9c96990121d70d6b5f5a06ccb17dc567750b7 100644 >--- a/LayoutTests/tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/sticky/sticky-horizontal-expected.txt >@@ -12,7 +12,6 @@ Left sticky Right sticky Left % sticky Right % sticky Left and Right Left and Ri > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled horizontal scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (800,0) size 800x585) > (min layout viewport origin (0,0)) > (max layout viewport origin (1208,0)) >diff --git a/LayoutTests/tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt b/LayoutTests/tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt >index 502e92547588bb7bc5bd42a4b99b16da067d0297..f5ae3844bf63f5a1ade6184651cbeae81c5d8736 100644 >--- a/LayoutTests/tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt >+++ b/LayoutTests/tiled-drawing/scrolling/sticky/sticky-vertical-expected.txt >@@ -16,7 +16,6 @@ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor > (horizontal scrollbar mode 0) > (vertical scrollbar mode 0) > (has enabled vertical scrollbar 1)) >- (visual viewport enabled 1) > (layout viewport at (0,580) size 785x600) > (min layout viewport origin (0,0)) > (max layout viewport origin (0,2308))
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 194928
:
362685
|
362691
| 362693 |
362694