Changeset 284685 in webkit

Timestamp:

Oct 22, 2021, 9:04:32 AM (5 years ago)

Author:

Ayumi Kojima

Message:

Unreviewed, reverting r284654.

Reverting because this commit caused scrolling tests to fail

Reverted changeset:

"Content offset in this codepen when switching tabs"
​https://bugs.webkit.org/show_bug.cgi?id=231989
​https://commits.webkit.org/r284654

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt (modified) (3 diffs)
• LayoutTests/tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (modified) (1 diff)
• Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp (modified) (2 diffs)
• Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h (modified) (2 diffs)
• Source/WebCore/page/scrolling/ScrollingStateTree.cpp (modified) (1 diff)
• Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp (modified) (2 diffs)
• Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (modified) (2 diffs)
• Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (6 diffs)
• Tools/TestWebKitAPI/Tests/mac/ScrollingCoordinatorTests.mm (deleted)
• Tools/TestWebKitAPI/cocoa/TestWKWebView.h (modified) (1 diff)
• Tools/TestWebKitAPI/cocoa/TestWKWebView.mm (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-10-22  Ayumi Kojima  <ayumi_kojima@apple.com>
+
+        Unreviewed, reverting r284654.
+
+        Reverting because this commit caused scrolling tests to fail
+
+        Reverted changeset:
+
+        "Content offset in this codepen when switching tabs"
+        https://bugs.webkit.org/show_bug.cgi?id=231989
+        https://commits.webkit.org/r284654
+
 2021-10-22  Alan Bujtas  <zalan@apple.com>
 

trunk/LayoutTests/tiled-drawing/scrolling/clamp-out-of-bounds-scrolls-expected.txt

@@ -56 +56 @@
 
 (Frame scrolling node
-  (scroll position 4223 0)
   (scrollable area size 785 585)
   (contents size 5008 5021)
@@ -77 +76 @@
 
 (Frame scrolling node
-  (scroll position 0 4436)
+  (scroll position 4223 0)
   (scrollable area size 785 585)
   (contents size 5008 5021)
@@ -98 +97 @@
 
 (Frame scrolling node
-  (scroll position 4223 4436)
+  (scroll position 0 4436)
   (scrollable area size 785 585)
   (contents size 5008 5021)

trunk/LayoutTests/tiled-drawing/scrolling/scrolling-tree-after-scroll-expected.txt

@@ -1 +1 @@
 
 (Frame scrolling node
-  (scroll position 0 3000)
   (scrollable area size 785 600)
   (contents size 785 5021)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-22  Ayumi Kojima  <ayumi_kojima@apple.com>
+
+        Unreviewed, reverting r284654.
+
+        Reverting because this commit caused scrolling tests to fail
+
+        Reverted changeset:
+
+        "Content offset in this codepen when switching tabs"
+        https://bugs.webkit.org/show_bug.cgi?id=231989
+        https://commits.webkit.org/r284654
+
 2021-10-22  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp

@@ -452 +452 @@
     }
 
-    auto* node = m_scrollingStateTree->stateNodeForID(scrollingNodeID);
-    if (is<ScrollingStateScrollingNode>(node)) {
-        auto& scrollingNode = downcast<ScrollingStateScrollingNode>(*node);
-        scrollingNode.syncScrollPosition(scrollPosition);
-    }
-
     if (scrollingNodeID == frameView.scrollingNodeID()) {
         reconcileScrollingState(frameView, scrollPosition, layoutViewportOrigin, scrollType, ViewportRectStability::Stable, scrollingLayerPositionAction);

trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp

@@ -144 +144 @@
 }
 
-void ScrollingStateScrollingNode::syncScrollPosition(const FloatPoint& scrollPosition)
-{
-    m_scrollPosition = scrollPosition;
-}
-
 void ScrollingStateScrollingNode::setScrollOrigin(const IntPoint& scrollOrigin)
 {
@@ -210 +205 @@
     m_requestedScrollData = scrollData;
     setPropertyChanged(Property::RequestedScrollPosition);
-}
-
-bool ScrollingStateScrollingNode::hasScrollPositionRequest() const
-{
-    return hasChangedProperty(Property::RequestedScrollPosition) && m_requestedScrollData.requestType == ScrollRequestType::PositionUpdate;
 }
 

trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h

@@ -55 +55 @@
     WEBCORE_EXPORT void setScrollPosition(const FloatPoint&);
 
-    // Does not trigger a scrolling tree commit.
-    WEBCORE_EXPORT void syncScrollPosition(const FloatPoint&);
-
     const IntPoint& scrollOrigin() const { return m_scrollOrigin; }
     WEBCORE_EXPORT void setScrollOrigin(const IntPoint&);
@@ -81 +78 @@
     const RequestedScrollData& requestedScrollData() const { return m_requestedScrollData; }
     WEBCORE_EXPORT void setRequestedScrollData(const RequestedScrollData&);
-
-    WEBCORE_EXPORT bool hasScrollPositionRequest() const;
 
     bool isMonitoringWheelEvents() const { return m_isMonitoringWheelEvents; }

trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp

@@ -177 +177 @@
         if (parentID) {
             if (auto unparentedNode = m_unparentedNodes.take(newNodeID)) {
-                LOG_WITH_STREAM(ScrollingTree, stream << "ScrollingStateTree " << this << " insertNode reattaching node " << newNodeID);
+                LOG_WITH_STREAM(ScrollingTree, stream << "ScrollingStateTree " << this << " insertNode " << newNodeID << " getting node from unparented nodes");
                 newNode = unparentedNode.get();
                 nodeWasReattachedRecursive(*unparentedNode);

trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp

@@ -73 +73 @@
         m_fixedElementsLayoutRelativeToFrame = state.fixedElementsLayoutRelativeToFrame();
 
-    if (state.hasChangedProperty(ScrollingStateNode::Property::LayoutViewport))
+    if (state.hasChangedProperty(ScrollingStateNode::Property::LayoutViewport)) {
         m_layoutViewport = state.layoutViewport();
+        updateViewportForCurrentScrollPosition({ });
+    }
 
     if (state.hasChangedProperty(ScrollingStateNode::Property::MinLayoutViewportOrigin))
@@ -84 +86 @@
     if (state.hasChangedProperty(ScrollingStateNode::Property::OverrideVisualViewportSize))
         m_overrideVisualViewportSize = state.overrideVisualViewportSize();
-
-    if (state.hasChangedProperty(ScrollingStateNode::Property::LayoutViewport)) {
-        // This requires that minLayoutViewportOrigin and maxLayoutViewportOrigin have been updated.
-        updateViewportForCurrentScrollPosition({ });
-    }
 }
 

trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp

@@ -68 +68 @@
     if (state.hasChangedProperty(ScrollingStateNode::Property::ScrollPosition)) {
         m_lastCommittedScrollPosition = state.scrollPosition();
-        if (m_isFirstCommit && !state.hasScrollPositionRequest())
+        if (m_isFirstCommit && !state.hasChangedProperty(ScrollingStateNode::Property::RequestedScrollPosition))
             m_currentScrollPosition = m_lastCommittedScrollPosition;
     }
@@ -337 +337 @@
     ts.dumpProperty("last committed scroll position", m_lastCommittedScrollPosition);
 
-    if (!m_currentScrollPosition.isZero())
-        ts.dumpProperty("scroll position", m_currentScrollPosition);
-
-    if (!m_scrollOrigin.isZero())
+    if (m_scrollOrigin != IntPoint())
         ts.dumpProperty("scroll origin", m_scrollOrigin);
 

trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm

@@ -115 +115 @@
         return;
 
-    LOG_WITH_STREAM(ScrollingTree, stream << "ScrollingCoordinatorMac::commitTreeState: state tree " << scrollingStateTreeAsText(debugScrollingStateTreeAsTextBehaviors));
+    LOG_WITH_STREAM(ScrollingTree, stream << scrollingStateTreeAsText(debugScrollingStateTreeAsTextBehaviors));
 
     auto stateTree = scrollingStateTree()->commit(LayerRepresentation::PlatformLayerRepresentation);

trunk/Tools/ChangeLog

@@ +1 @@
+2021-10-22  Ayumi Kojima  <ayumi_kojima@apple.com>
+
+        Unreviewed, reverting r284654.
+
+        Reverting because this commit caused scrolling tests to fail
+
+        Reverted changeset:
+
+        "Content offset in this codepen when switching tabs"
+        https://bugs.webkit.org/show_bug.cgi?id=231989
+        https://commits.webkit.org/r284654
+
 2021-10-22  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -87 +87 @@
                 0F5651F71FCE4DDC00310FBC /* NoHistoryItemScrollToFragment.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F5651F61FCE4DDB00310FBC /* NoHistoryItemScrollToFragment.mm */; };
                 0F5651F91FCE513500310FBC /* scroll-to-anchor.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 0F5651F81FCE50E800310FBC /* scroll-to-anchor.html */; };
-                0FEFAF64271FC2CD005704D7 /* ScrollingCoordinatorTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FEFAF63271FC2CD005704D7 /* ScrollingCoordinatorTests.mm */; };
                 0FF1134E22D68679009A81DA /* ScrollViewScrollabilityTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0FF1134D22D68679009A81DA /* ScrollViewScrollabilityTests.mm */; };
                 115EB3431EE0BA03003C2C0A /* ViewportSizeForViewportUnits.mm in Sources */ = {isa = PBXBuildFile; fileRef = 115EB3421EE0B720003C2C0A /* ViewportSizeForViewportUnits.mm */; };
@@ -1863 +1862 @@
                 0FE447971B76F1E3009498EB /* ParkingLot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParkingLot.cpp; sourceTree = "<group>"; };
                 0FEAE3671B7D19CB00CE17F2 /* Condition.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Condition.cpp; sourceTree = "<group>"; };
-                0FEFAF63271FC2CD005704D7 /* ScrollingCoordinatorTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollingCoordinatorTests.mm; sourceTree = "<group>"; };
                 0FF1134D22D68679009A81DA /* ScrollViewScrollabilityTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ScrollViewScrollabilityTests.mm; sourceTree = "<group>"; };
                 0FFC45A41B73EBE20085BD62 /* Lock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lock.cpp; sourceTree = "<group>"; };
@@ -3098 +3096 @@
                 F44A531021B8976900DBB99C /* InstanceMethodSwizzler.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = InstanceMethodSwizzler.mm; path = ../TestRunnerShared/cocoa/InstanceMethodSwizzler.mm; sourceTree = "<group>"; };
                 F44A7D1F268D5C6900B49BB8 /* ImageAnalysisTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ImageAnalysisTests.mm; sourceTree = "<group>"; };
+                F44A9AF52649BBDD00E7CB16 /* ImmediateActionTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ImmediateActionTests.h; sourceTree = "<group>"; };
                 F44A9AF62649BBDD00E7CB16 /* ImmediateActionTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ImmediateActionTests.mm; sourceTree = "<group>"; };
                 F44C79FB20F9E50C0014478C /* ParserYieldTokenPlugIn.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ParserYieldTokenPlugIn.mm; sourceTree = "<group>"; };
@@ -4834 +4833 @@
                                 9B4F8FA3159D52B1002D9F94 /* HTMLCollectionNamedItem.mm */,
                                 9B26FC6B159D061000CC3765 /* HTMLFormCollectionNamedItem.mm */,
+                                F44A9AF52649BBDD00E7CB16 /* ImmediateActionTests.h */,
                                 F44A9AF62649BBDD00E7CB16 /* ImmediateActionTests.mm */,
                                 C507E8A614C6545B005D6B3B /* InspectorBar.mm */,
@@ -4853 +4853 @@
                                 37C784DE197C8F2E0010A496 /* RenderedImageFromDOMNode.mm */,
                                 3722C8681461E03E00C45D00 /* RenderedImageFromDOMRange.mm */,
-                                0FEFAF63271FC2CD005704D7 /* ScrollingCoordinatorTests.mm */,
                                 261516D515B0E60500A2C201 /* SetAndUpdateCacheModel.mm */,
                                 52B8CF9515868CF000281053 /* SetDocumentURI.mm */,
@@ -5852 +5851 @@
                                 CDCFA7AA1E45183200C2433D /* SampleMap.cpp in Sources */,
                                 CE0947372063223B003C9BA0 /* SchemeRegistry.mm in Sources */,
-                                0FEFAF64271FC2CD005704D7 /* ScrollingCoordinatorTests.mm in Sources */,
                                 CDC0932B21C872C10030C4B0 /* ScrollingDoesNotPauseMedia.mm in Sources */,
                                 7CCE7F121A411AE600447C4C /* ScrollPinningBehaviors.cpp in Sources */,

trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.h

@@ -140 +140 @@
 - (void)sendClicksAtPoint:(NSPoint)pointInWindow numberOfClicks:(NSUInteger)numberOfClicks;
 - (void)sendClickAtPoint:(NSPoint)pointInWindow;
-- (void)wheelEventAtPoint:(CGPoint)pointInWindow wheelDelta:(CGSize)delta;
 - (NSWindow *)hostWindow;
 - (void)typeCharacter:(char)character modifiers:(NSEventModifierFlags)modifiers;

trunk/Tools/TestWebKitAPI/cocoa/TestWKWebView.mm

@@ -205 +205 @@
 - (id)objectByEvaluatingJavaScript:(NSString *)script
 {
-    bool callbackComplete = false;
+    bool isWaitingForJavaScript = false;
     RetainPtr<id> evalResult;
     [self _evaluateJavaScriptWithoutUserGesture:script completionHandler:[&] (id result, NSError *error) {
         evalResult = result;
-        callbackComplete = true;
+        isWaitingForJavaScript = true;
         EXPECT_TRUE(!error);
         if (error)
             NSLog(@"Encountered error: %@ while evaluating script: %@", error, script);
     }];
-    TestWebKitAPI::Util::run(&callbackComplete);
+    TestWebKitAPI::Util::run(&isWaitingForJavaScript);
     return evalResult.autorelease();
 }
@@ -220 +220 @@
 - (id)objectByEvaluatingJavaScriptWithUserGesture:(NSString *)script
 {
-    bool callbackComplete = false;
+    bool isWaitingForJavaScript = false;
     RetainPtr<id> evalResult;
     [self evaluateJavaScript:script completionHandler:[&] (id result, NSError *error) {
         evalResult = result;
-        callbackComplete = true;
+        isWaitingForJavaScript = true;
         EXPECT_TRUE(!error);
         if (error)
             NSLog(@"Encountered error: %@ while evaluating script: %@", error, script);
     }];
-    TestWebKitAPI::Util::run(&callbackComplete);
+    TestWebKitAPI::Util::run(&isWaitingForJavaScript);
     return evalResult.autorelease();
 }
@@ -235 +235 @@
 - (id)objectByCallingAsyncFunction:(NSString *)script withArguments:(NSDictionary *)arguments error:(NSError **)errorOut
 {
-    bool callbackComplete = false;
+    bool isWaitingForJavaScript = false;
     if (errorOut)
         *errorOut = nil;
@@ -244 +244 @@
         evalResult = result;
         strongError = error;
-        callbackComplete = true;
-    }];
-    TestWebKitAPI::Util::run(&callbackComplete);
+        isWaitingForJavaScript = true;
+    }];
+    TestWebKitAPI::Util::run(&isWaitingForJavaScript);
 
     if (errorOut)
@@ -863 +863 @@
 }
 
-- (void)wheelEventAtPoint:(CGPoint)pointInWindow wheelDelta:(CGSize)delta
-{
-    RetainPtr<CGEventRef> cgScrollEvent = adoptCF(CGEventCreateScrollWheelEvent(nullptr, kCGScrollEventUnitPixel, 2, delta.height, delta.width, 0));
-
-    CGPoint locationInGlobalScreenCoordinates = [[self window] convertPointToScreen:pointInWindow];
-    locationInGlobalScreenCoordinates.y = [[[NSScreen screens] objectAtIndex:0] frame].size.height - locationInGlobalScreenCoordinates.y;
-    CGEventSetLocation(cgScrollEvent.get(), locationInGlobalScreenCoordinates);
-    
-    NSEvent* event = [NSEvent eventWithCGEvent:cgScrollEvent.get()];
-    [self scrollWheel:event];
-}
-
 - (NSWindow *)hostWindow
 {