topcoderKai
diff --git a/‎LayoutTests/ChangeLog
+65 b/‎LayoutTests/ChangeLog
+65
diff --git a/‎LayoutTests/editing/caret/ios/absolute-caret-position-after-scroll-expected.txt
+8-6 b/‎LayoutTests/editing/caret/ios/absolute-caret-position-after-scroll-expected.txt
+8-6
diff --git a/‎LayoutTests/editing/caret/ios/absolute-caret-position-after-scroll.html
+35-59 b/‎LayoutTests/editing/caret/ios/absolute-caret-position-after-scroll.html
+35-59
diff --git a/‎LayoutTests/editing/caret/ios/fixed-caret-position-after-scroll-expected.txt
+8-1 b/‎LayoutTests/editing/caret/ios/fixed-caret-position-after-scroll-expected.txt
+8-1
diff --git a/‎LayoutTests/editing/caret/ios/fixed-caret-position-after-scroll.html
+35-55 b/‎LayoutTests/editing/caret/ios/fixed-caret-position-after-scroll.html
+35-55
diff --git a/‎LayoutTests/editing/secure-input/password-input-changed-type.html
+20-7 b/‎LayoutTests/editing/secure-input/password-input-changed-type.html
+20-7
@@ -1,3 +1,68 @@
+2017-08-22  Wenson Hsieh  <[email protected]>
+
+        [WK2] EditorState updates should be rolled into the layer update lifecycle when possible
+        https://bugs.webkit.org/show_bug.cgi?id=175370
+        <rdar://problem/33799806>
+
+        Reviewed by Ryosuke Niwa.
+
+        Rebaseline and adjust LayoutTests.
+
+        * editing/caret/ios/absolute-caret-position-after-scroll-expected.txt:
+        * editing/caret/ios/absolute-caret-position-after-scroll.html:
+        * editing/caret/ios/fixed-caret-position-after-scroll-expected.txt:
+        * editing/caret/ios/fixed-caret-position-after-scroll.html:
+        * editing/secure-input/password-input-changed-type.html:
+        * editing/secure-input/password-input-focusing.html:
+        * editing/secure-input/removed-password-input.html:
+        * editing/secure-input/reset-state-on-navigation.html:
+        * editing/selection/character-granularity-rect.html:
+
+        Delay checking for secure input state and caret rects until after the next presentation update.
+
+        * editing/selection/ios/absolute-selection-after-scroll-expected.txt:
+        * editing/selection/ios/absolute-selection-after-scroll.html:
+        * editing/selection/ios/fixed-selection-after-scroll-expected.txt:
+        * editing/selection/ios/fixed-selection-after-scroll.html:
+
+        Refactor and simplify these tests. These tests are not run on the OpenSource bots, since they depend on long
+        press and tap gestures.
+
+        * platform/ios-wk2/editing/inserting/insert-div-024-expected.txt:
+        * platform/ios-wk2/editing/inserting/insert-div-026-expected.txt:
+        * platform/ios-wk2/editing/style/5084241-expected.txt:
+
+        Rebaselines these tests, removing an anonymous RenderBlock inserted as a result of inserting and removing a
+        dummy span in order to compute a RenderStyle in WebPage::editorState. This is because editorState is no longer
+        invoked immediately on page load; https://bugs.webkit.org/show_bug.cgi?id=175116 tracks preventing this render
+        tree thrashing altogether.
+
+        * platform/mac-wk2/TestExpectations:
+        * platform/mac-wk2/editing/style/unbold-in-bold-expected.txt:
+        * resources/ui-helper.js:
+
+        Introduce new UIHelper functions.
+
+        (window.UIHelper.ensurePresentationUpdate.return.new.Promise):
+        (window.UIHelper.ensurePresentationUpdate):
+
+        Returns a Promise, resolved after the next presentation update.
+
+        (window.UIHelper.activateAndWaitForInputSessionAt.return.new.Promise.):
+        (window.UIHelper.activateAndWaitForInputSessionAt.return.new.Promise):
+        (window.UIHelper.activateAndWaitForInputSessionAt):
+
+        Returns a Promise, resolved after tapping at the given location and waiting for the keyboard to appear on iOS.
+
+        (window.UIHelper.getUICaretRect.return.new.Promise.):
+        (window.UIHelper.getUICaretRect.return.new.Promise):
+        (window.UIHelper.getUICaretRect):
+        (window.UIHelper.getUISelectionRects.return.new.Promise.):
+        (window.UIHelper.getUISelectionRects.return.new.Promise):
+        (window.UIHelper.getUISelectionRects):
+
+        Helpers to fetch selection and caret rect information in the UI process.
+
 2017-08-21  Ryosuke Niwa  <[email protected]>
 
         Consolidate the code to normalize MIME type in DataTransfer
 
@@ -1,10 +1,12 @@
+PASS initialCaretRect.left is 6
+PASS initialCaretRect.top is 21
+PASS initialCaretRect.width is 3
+PASS initialCaretRect.height is 15
+PASS finalCaretRect.left is 6
+PASS finalCaretRect.top is 21
+PASS finalCaretRect.width is 3
+PASS finalCaretRect.height is 15
 PASS successfullyParsed is true
 
 TEST COMPLETE
-The initial caret rect is: [6 21 ; 3 15]
-The caret rect after scrolling 1000px down is: [6 21 ; 3 15]
-PASS finalCaretRect.top is initialCaretRect.top
-PASS finalCaretRect.left is initialCaretRect.left
-PASS finalCaretRect.width is initialCaretRect.width
-PASS finalCaretRect.height is initialCaretRect.height
 
@@ -2,6 +2,7 @@
 <html>
 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 <head>
+    <script src="../../../resources/ui-helper.js"></script>
     <script src="../../../resources/js-test.js"></script>
     <style>
         body {
@@ -18,68 +19,43 @@
 
         div {
             background-image: linear-gradient(0deg, blue, red);
-            height: 4000px;
+            height: 10000px;
         }
     </style>
-    <script>
-    jsTestIsAsync = true;
-
-    function tapInInputScript(tapX, tapY)
-    {
-        return `(function() {
-            uiController.didShowKeyboardCallback = function() {
-                uiController.doAfterNextStablePresentationUpdate(function() {
-                    uiController.uiScriptComplete(JSON.stringify(uiController.textSelectionCaretRect));
-                });
-            };
-            uiController.singleTapAtPoint(${tapX}, ${tapY}, function() { });
-        })()`;
-    }
-
-    function simulateScrollingScript(distance)
-    {
-        return `(function() {
-            uiController.stableStateOverride = false;
-            uiController.immediateScrollToOffset(0, ${distance});
-            uiController.stableStateOverride = true;
-            uiController.doAfterNextStablePresentationUpdate(function() {
-                uiController.uiScriptComplete(JSON.stringify(uiController.textSelectionCaretRect));
-            });
-        })()`;
-    }
-
-    function toString(rect)
-    {
-        return `[${rect.left} ${rect.top} ; ${rect.width} ${rect.height}]`;
-    }
-
-    function run()
-    {
-        if (!window.testRunner || !testRunner.runUIScript) {
-            description("To manually test, tap this input field and scroll up. The text caret should not end up outside of the input.");
-            return;
-        }
-
-        testRunner.runUIScript(tapInInputScript(window.innerWidth / 2, 30), initialCaretRect => {
-            initialCaretRect = JSON.parse(initialCaretRect);
-            window.initialCaretRect = initialCaretRect;
-            debug(`The initial caret rect is: ${toString(initialCaretRect)}`);
-            testRunner.runUIScript(simulateScrollingScript(1000), finalCaretRect => {
-                finalCaretRect = JSON.parse(finalCaretRect);
-                window.finalCaretRect = finalCaretRect;
-                debug(`The caret rect after scrolling 1000px down is: ${toString(finalCaretRect)}`);
-                shouldBe("finalCaretRect.top", "initialCaretRect.top");
-                shouldBe("finalCaretRect.left", "initialCaretRect.left");
-                shouldBe("finalCaretRect.width", "initialCaretRect.width");
-                shouldBe("finalCaretRect.height", "initialCaretRect.height");
-                finishJSTest();
-            });
-        });
-    }
-    </script>
 </head>
-<body onload=run()>
-    <input></input>
+<body>
+<div>
+<input id="input"></input>
+</div>
 </body>
+<script>
+jsTestIsAsync = true;
+
+(() => {
+    if (!window.testRunner || !testRunner.runUIScript) {
+        description("To manually test, tap this input field and scroll up. The text caret should not end up outside of the input.");
+        return;
+    }
 
+    UIHelper.activateAndWaitForInputSessionAt(innerWidth / 2, 30)
+    .then(() => UIHelper.getUICaretRect())
+    .then((rect) => {
+        initialCaretRect = rect;
+        shouldBe("initialCaretRect.left", "6");
+        shouldBe("initialCaretRect.top", "21");
+        shouldBe("initialCaretRect.width", "3");
+        shouldBe("initialCaretRect.height", "15");
+        document.body.scrollTop += 5000;
+        return UIHelper.getUICaretRect();
+    })
+    .then((rect) => {
+        finalCaretRect = rect;
+        shouldBe("finalCaretRect.left", "6");
+        shouldBe("finalCaretRect.top", "21");
+        shouldBe("finalCaretRect.width", "3");
+        shouldBe("finalCaretRect.height", "15");
+        finishJSTest();
+    });
+})();
+</script>
 </html>
@@ -1,5 +1,12 @@
+PASS initialCaretRect.left is 6
+PASS initialCaretRect.top is 21
+PASS initialCaretRect.width is 3
+PASS initialCaretRect.height is 15
+PASS finalCaretRect.left is 6
+PASS finalCaretRect.top is 5021
+PASS finalCaretRect.width is 3
+PASS finalCaretRect.height is 15
 PASS successfullyParsed is true
 
 TEST COMPLETE
-PASS finalCaretRect.top - initialCaretRect.top is 500
 
@@ -2,6 +2,7 @@
 <html>
 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 <head>
+    <script src="../../../resources/ui-helper.js"></script>
     <script src="../../../resources/js-test.js"></script>
     <style>
         body {
@@ -18,64 +19,43 @@
 
         div {
             background-image: linear-gradient(blue, red);
-            height: 4000px;
+            height: 10000px;
         }
     </style>
-    <script>
-    jsTestIsAsync = true;
-
-    function getInputViewBoundsAfterTappingInInputScript(tapX, tapY)
-    {
-        return `(function() {
-            uiController.didShowKeyboardCallback = function() {
-                uiController.doAfterNextStablePresentationUpdate(function() {
-                    uiController.uiScriptComplete(JSON.stringify(uiController.inputViewBounds));
-                });
-            };
-            uiController.singleTapAtPoint(${tapX}, ${tapY}, function() { });
-        })()`;
-    }
-
-    function getCaretRectAfterScrollToOffsetScript(distance)
-    {
-        return `(function() {
-            uiController.stableStateOverride = false;
-            uiController.immediateScrollToOffset(0, ${distance});
-            uiController.stableStateOverride = true;
-            uiController.doAfterNextStablePresentationUpdate(function() {
-                uiController.uiScriptComplete(JSON.stringify(uiController.textSelectionCaretRect));
-            });
-        })()`;
-    }
-
-    function toString(rect)
-    {
-        return `[${rect.left} ${rect.top} ; ${rect.width} ${rect.height}]`;
-    }
-
-    function run()
-    {
-        if (!window.testRunner || !testRunner.runUIScript) {
-            description("To manually test, tap this input field and scroll up. The text caret should not end up outside of the input.");
-            return;
-        }
-
-        testRunner.runUIScript(getInputViewBoundsAfterTappingInInputScript(window.innerWidth / 2, 30), (inputViewBounds) => {
-            window.inputViewBounds = inputViewBounds = JSON.parse(inputViewBounds);
-            testRunner.runUIScript(getCaretRectAfterScrollToOffsetScript(inputViewBounds.height), initialCaretRect => {
-                window.initialCaretRect = initialCaretRect = JSON.parse(initialCaretRect);
-                testRunner.runUIScript(getCaretRectAfterScrollToOffsetScript(inputViewBounds.height + 500), finalCaretRect => {
-                    window.finalCaretRect = finalCaretRect = JSON.parse(finalCaretRect);
-                    shouldBe("finalCaretRect.top - initialCaretRect.top", "500");
-                    finishJSTest();
-                });
-            });
-        });
-    }
-    </script>
 </head>
-<body onload=run()>
-    <input id="input"></input>
+<body>
+<div>
+<input id="input"></input>
+</div>
 </body>
+<script>
+jsTestIsAsync = true;
+
+(() => {
+    if (!window.testRunner || !testRunner.runUIScript) {
+        description("To manually test, tap this input field and scroll up. The text caret should not end up outside of the input.");
+        return;
+    }
 
+    UIHelper.activateAndWaitForInputSessionAt(innerWidth / 2, 30)
+    .then(() => UIHelper.getUICaretRect())
+    .then((rect) => {
+        initialCaretRect = rect;
+        shouldBe("initialCaretRect.left", "6");
+        shouldBe("initialCaretRect.top", "21");
+        shouldBe("initialCaretRect.width", "3");
+        shouldBe("initialCaretRect.height", "15");
+        document.body.scrollTop += 5000;
+        return UIHelper.getUICaretRect();
+    })
+    .then((rect) => {
+        finalCaretRect = rect;
+        shouldBe("finalCaretRect.left", "6");
+        shouldBe("finalCaretRect.top", "5021");
+        shouldBe("finalCaretRect.width", "3");
+        shouldBe("finalCaretRect.height", "15");
+        finishJSTest();
+    });
+})();
+</script>
 </html>
@@ -2,27 +2,40 @@
 <html>
 <head>
 <meta charset="utf-8">
+<script src="../../resources/ui-helper.js"></script>
 <script src="../../resources/js-test-pre.js"></script>
 </head>
 <body>
 <input type=password>
 <script>
 
+jsTestIsAsync = true;
+
 description("Verify that changing a password input's type updates secure input state.");
 
 var passwordInput = document.getElementsByTagName("input")[0];
 
 debug("A password input is focused:");
 passwordInput.focus();
-shouldBe("testRunner.secureEventInputIsEnabled", "true");
 
-debug("\nAfter changing the type to text:");
-passwordInput.type = "text";
-shouldBe("testRunner.secureEventInputIsEnabled", "false");
+UIHelper.ensurePresentationUpdate().then(() => {
+    shouldBe("testRunner.secureEventInputIsEnabled", "true");
+    debug("\nAfter changing the type to text:");
+    passwordInput.type = "text";
+})
+
+.then(() => UIHelper.ensurePresentationUpdate())
+.then(() => {
+    shouldBe("testRunner.secureEventInputIsEnabled", "false");
+    debug("\nAfter changing the type back to password:");
+    passwordInput.type = "password";
+})
 
-debug("\nAfter changing the type back to password:");
-passwordInput.type = "password";
-shouldBe("testRunner.secureEventInputIsEnabled", "true");
+.then(() => UIHelper.ensurePresentationUpdate())
+.then(() => {
+    shouldBe("testRunner.secureEventInputIsEnabled", "true");
+    finishJSTest();
+});
 
 </script>
 <script src="../../resources/js-test-post.js"></script>