Revert "Apply patch. rdar://problem/108008629"

This reverts commit 84d7397. Identifier: 259548.686@safari-7615-branch
WebKit · Apr 25, 2023 · 1d51b2f · 1d51b2f
1 parent 84d7397
commit 1d51b2f
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 1,368 deletions.
diff --git a/LayoutTests/css3/scroll-snap/ios/scroll-snap-mainframe-pinch-out-expected.txt b/LayoutTests/css3/scroll-snap/ios/scroll-snap-mainframe-pinch-out-expected.txt
diff --git a/LayoutTests/css3/scroll-snap/ios/scroll-snap-mainframe-pinch-out.html b/LayoutTests/css3/scroll-snap/ios/scroll-snap-mainframe-pinch-out.html
diff --git a/...s/css3/scroll-snap/ios/scroll-snap-mainframe-scroll-deceleration-with-obscured-inset.html b/...s/css3/scroll-snap/ios/scroll-snap-mainframe-scroll-deceleration-with-obscured-inset.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true obscuredInset.top=50 ] -->
 <html>
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<head>
 <script src="../../../resources/js-test.js"></script>
 <script src="../../../resources/ui-helper.js"></script>
+<head>
 <style>
 body, html {
     width: 100%;

diff --git a/LayoutTests/resources/ui-helper.js b/LayoutTests/resources/ui-helper.js
@@ -1623,98 +1623,6 @@ window.UIHelper = class UIHelper {
         });
     }
 
-    static async pinch(firstStartX, firstStartY, secondStartX, secondStartY, firstEndX, firstEndY, secondEndX, secondEndY)
-    {
-        await UIHelper.sendEventStream({
-            events: [
-                {
-                    interpolate : "linear",
-                    timestep : 0.01,
-                    coordinateSpace : "content",
-                    startEvent : {
-                        inputType : "hand",
-                        timeOffset : 0,
-                        touches : [
-                            { inputType : "finger", phase : "began", id : 1, x : firstStartX, y : firstStartY, pressure : 0 },
-                            { inputType : "finger", phase : "began", id : 2, x : secondStartX, y : secondStartY, pressure : 0 }
-                        ]
-                    },
-                    endEvent : {
-                        inputType : "hand",
-                        timeOffset : 0.01,
-                        touches : [
-                            { inputType : "finger", phase : "began", id : 1, x : firstStartX, y : firstStartY, pressure : 0 },
-                            { inputType : "finger", phase : "began", id : 2, x : secondStartX, y : secondStartY, pressure : 0 }
-                        ]
-                    }
-                },
-                {
-                    interpolate : "linear",
-                    timestep : 0.01,
-                    coordinateSpace : "content",
-                    startEvent : {
-                        inputType : "hand",
-                        timeOffset : 0.01,
-                        touches : [
-                            { inputType : "finger", phase : "moved", id : 1, x : firstStartX, y : firstStartY, pressure : 0 },
-                            { inputType : "finger", phase : "moved", id : 2, x : secondStartX, y : secondStartY, pressure : 0 }
-                        ]
-                    },
-                    endEvent : {
-                        inputType : "hand",
-                        timeOffset : 0.9,
-                        touches : [
-                            { inputType : "finger", phase : "moved", id : 1, x : firstEndX, y : firstEndY, pressure : 0 },
-                            { inputType : "finger", phase : "moved", id : 2, x : secondEndX, y : secondEndY, pressure : 0 }
-                        ]
-                    }
-                },
-                {
-                    interpolate : "linear",
-                    timestep : 0.01,
-                    coordinateSpace : "content",
-                    startEvent : {
-                        inputType : "hand",
-                        timeOffset : 0.9,
-                        touches : [
-                            { inputType : "finger", phase : "stationary", id : 1, x : firstEndX, y : firstEndY, pressure : 0 },
-                            { inputType : "finger", phase : "stationary", id : 2, x : secondEndX, y : secondEndY, pressure : 0 }
-                        ]
-                    },
-                    endEvent : {
-                        inputType : "hand",
-                        timeOffset : 0.99,
-                        touches : [
-                            { inputType : "finger", phase : "stationary", id : 1, x : firstEndX, y : firstEndY, pressure : 0 },
-                            { inputType : "finger", phase : "stationary", id : 2, x : secondEndX, y : secondEndY, pressure : 0 }
-                        ]
-                    }
-                },
-                {
-                    interpolate : "linear",
-                    timestep : 0.01,
-                    coordinateSpace : "content",
-                    startEvent : {
-                        inputType : "hand",
-                        timeOffset : 0.99,
-                        touches : [
-                            { inputType : "finger", phase : "ended", id : 1, x : firstEndX, y : firstEndY, pressure : 0 },
-                            { inputType : "finger", phase : "ended", id : 2, x : secondEndX, y : secondEndY, pressure : 0 }
-                        ]
-                    },
-                    endEvent : {
-                        inputType : "hand",
-                        timeOffset : 1,
-                        touches : [
-                            { inputType : "finger", phase : "ended", id : 1, x : firstEndX, y : firstEndY, pressure : 0 },
-                            { inputType : "finger", phase : "ended", id : 2, x : secondEndX, y : secondEndY, pressure : 0 }
-                        ]
-                    }
-                }
-            ]
-        });
-    }
-
     static setWindowIsKey(isKey)
     {
         const script = `uiController.windowIsKey = ${isKey}`;

diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h
@@ -635,8 +635,6 @@ class ChromeClient {
     virtual void classifyModalContainerControls(Vector<String>&& texts, CompletionHandler<void(Vector<ModalContainerControlType>&&)>&&) = 0;
 
     virtual void decidePolicyForModalContainer(OptionSet<ModalContainerControlType>, CompletionHandler<void(ModalContainerDecision)>&&) = 0;
-
-    virtual bool isInStableState() const { return true; }
 
 protected:
     WEBCORE_EXPORT ChromeClient();

diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
@@ -3018,13 +3018,6 @@ bool FrameView::isRubberBandInProgress() const
     return false;
 }
 
-bool FrameView::isInStableState() const
-{
-    if (auto* page = m_frame->page())
-        return page->chrome().client().isInStableState();
-    return AbstractFrameView::isInStableState();
-}
-
 bool FrameView::requestStartKeyboardScrollAnimation(const KeyboardScroll& scrollData)
 {
     if (auto scrollingCoordinator = this->scrollingCoordinator())