Title: [216831] branches/safari-603-branch/LayoutTests

Diff

Modified: branches/safari-603-branch/LayoutTests/ChangeLog (216830 => 216831)


--- branches/safari-603-branch/LayoutTests/ChangeLog	2017-05-14 01:07:05 UTC (rev 216830)
+++ branches/safari-603-branch/LayoutTests/ChangeLog	2017-05-14 02:18:13 UTC (rev 216831)
@@ -1,3 +1,17 @@
+2017-05-13  Ryan Haddad  <[email protected]>
+
+        Merge r216614.
+
+    2017-05-10  Andy Estes  <[email protected]>
+
+            r216599 accidentally included two copies of the new layout test and expected result
+            https://bugs.webkit.org/show_bug.cgi?id=171938
+
+            Unreviewed.
+
+            * http/tests/navigation/keyboard-events-during-provisional-subframe-navigation-expected.txt:
+            * http/tests/navigation/keyboard-events-during-provisional-subframe-navigation.html:
+
 2017-05-12  Jason Marcell  <[email protected]>
 
         Cherry-pick r216599. rdar://problem/32081484

Modified: branches/safari-603-branch/LayoutTests/http/tests/navigation/keyboard-events-during-provisional-subframe-navigation-expected.txt (216830 => 216831)


--- branches/safari-603-branch/LayoutTests/http/tests/navigation/keyboard-events-during-provisional-subframe-navigation-expected.txt	2017-05-14 01:07:05 UTC (rev 216830)
+++ branches/safari-603-branch/LayoutTests/http/tests/navigation/keyboard-events-during-provisional-subframe-navigation-expected.txt	2017-05-14 02:18:13 UTC (rev 216831)
@@ -36,41 +36,3 @@
 CONSOLE MESSAGE: line 5: compositionendevent dispatched (isTrusted: true).
 CONSOLE MESSAGE: line 48: Input element value after text input events: "ac".
 
-CONSOLE MESSAGE: line 16: Provisional navigation started.
-CONSOLE MESSAGE: line 17: No trusted events should be logged and the input element should have the value "".
-CONSOLE MESSAGE: line 20: Dispatching untrusted keypress event.
-CONSOLE MESSAGE: line 5: keypressevent dispatched (isTrusted: false).
-CONSOLE MESSAGE: line 28: Pressing tab.
-CONSOLE MESSAGE: line 30: Active element after pressing tab: [object HTMLInputElement].
-CONSOLE MESSAGE: line 32: Pressing "a".
-CONSOLE MESSAGE: line 38: Input element value after text input events: "".
-CONSOLE MESSAGE: line 20: Pressing "z" with access key modifiers should navigate to resources/keyboard-events-after-navigation.html.
-CONSOLE MESSAGE: line 6: Finished navigating to resources/keyboard-events-after-navigation.html.
-CONSOLE MESSAGE: line 7: Trusted events should be logged and the input element should have the value "ac".
-CONSOLE MESSAGE: line 20: Dispatching untrusted keypress event.
-CONSOLE MESSAGE: line 5: keypressevent dispatched (isTrusted: false).
-CONSOLE MESSAGE: line 28: Pressing tab.
-CONSOLE MESSAGE: line 5: keydownevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: keyupevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 30: Active element after pressing tab: [object HTMLInputElement].
-CONSOLE MESSAGE: line 32: Pressing "a".
-CONSOLE MESSAGE: line 5: keydownevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: keypressevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: textInputevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: beforeinputevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: inputevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: keyupevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 42: Setting marked text to "b".
-CONSOLE MESSAGE: line 5: compositionstartevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: compositionupdateevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: beforeinputevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: inputevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 45: Inserting text "c".
-CONSOLE MESSAGE: line 5: beforeinputevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: inputevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: textInputevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: beforeinputevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: inputevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 5: compositionendevent dispatched (isTrusted: true).
-CONSOLE MESSAGE: line 48: Input element value after text input events: "ac".
-

Modified: branches/safari-603-branch/LayoutTests/http/tests/navigation/keyboard-events-during-provisional-subframe-navigation.html (216830 => 216831)


--- branches/safari-603-branch/LayoutTests/http/tests/navigation/keyboard-events-during-provisional-subframe-navigation.html	2017-05-14 01:07:05 UTC (rev 216830)
+++ branches/safari-603-branch/LayoutTests/http/tests/navigation/keyboard-events-during-provisional-subframe-navigation.html	2017-05-14 02:18:13 UTC (rev 216831)
@@ -24,29 +24,3 @@
     </script>
 </body>
 </html>
-<!DOCTYPE html>
-<html>
-<body>
-    <iframe id="subframe"></iframe>
-    <a href="" accesskey="z"></a>
-    <script src=""
-    <script>
-        if (window.testRunner) {
-            testRunner.dumpAsText();
-            testRunner.dumpChildFramesAsText();
-            testRunner.waitUntilDone();
-            internals.settings.setShouldSuppressKeyboardInputDuringProvisionalNavigation(true);
-        }
-
-        waitForProvisionalNavigation(function() {
-            console.log("Provisional navigation started.");
-            console.log("No trusted events should be logged and the input element should have the value \"\".");
-            runTest(document.getElementById("subframe").contentWindow);
-
-            console.log("Pressing \"z\" with access key modifiers should navigate to resources/keyboard-events-after-navigation.html.");
-            window.focus();
-            eventSender.keyDown("z", internals.accessKeyModifiers());
-        });
-    </script>
-</body>
-</html>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to