Diff
Modified: trunk/LayoutTests/ChangeLog (232429 => 232430)
--- trunk/LayoutTests/ChangeLog 2018-06-02 00:02:51 UTC (rev 232429)
+++ trunk/LayoutTests/ChangeLog 2018-06-02 00:04:43 UTC (rev 232430)
@@ -1,3 +1,23 @@
+2018-06-01 Ryosuke Niwa <[email protected]>
+
+ Move tests in LayoutTests/editing to appropriate subdirectories
+ https://bugs.webkit.org/show_bug.cgi?id=186212
+
+ Rubber-stamped by Wenson Hsieh.
+
+ Moved the following four tests in LayoutTests/editing to its subdirectories.
+
+ * editing/input/composition-underline-color-expected-mismatch.html: Moved from editing/composition-underline-color-expected-mismatch.html.
+ * editing/input/composition-underline-color.html: Move from editing/composition-underline-color.html.
+ * editing/input/marked-text-appearance-expected-mismatch.html: Copied from LayoutTests/editing/marked-text-appearance-expected-mismatch.html.
+ * editing/input/marked-text-appearance.html: Moved from editing/marked-text-appearance.html.
+ * editing/selection/rtl-to-ltr-editing-word-move-spin-expected.txt: Moved from editing/rtl-to-ltr-editing-word-move-spin-expected.txt.
+ * editing/selection/rtl-to-ltr-editing-word-move-spin.html: Moved from editing/rtl-to-ltr-editing-word-move-spin.html.
+ * editing/selection/simple-line-layout-caret-is-gone-expected.txt: Moved from editing/simple-line-layout-caret-is-gone-expected.txt.
+ * editing/selection/simple-line-layout-caret-is-gone.html: Moved from editing/simple-line-layout-caret-is-gone.html.
+ * editing/style/apply-style-iframe-crash-expected.txt: Moved from editing/apply-style-iframe-crash-expected.txt.
+ * editing/style/apply-style-iframe-crash.html: Moved from editing/apply-style-iframe-crash.html.
+
2018-06-01 David Fenton <[email protected]>
Skip fetch/api/redirect/redirect-method.html and fetch/api/redirect/redirect-method-worker.html on macOS debug.
Deleted: trunk/LayoutTests/editing/apply-style-iframe-crash-expected.txt (232429 => 232430)
--- trunk/LayoutTests/editing/apply-style-iframe-crash-expected.txt 2018-06-02 00:02:51 UTC (rev 232429)
+++ trunk/LayoutTests/editing/apply-style-iframe-crash-expected.txt 2018-06-02 00:04:43 UTC (rev 232430)
@@ -1,4 +0,0 @@
-
-
-PASS
-WebKit bug #132103: Crash applying editing commands from iframe onload event.
Deleted: trunk/LayoutTests/editing/apply-style-iframe-crash.html (232429 => 232430)
--- trunk/LayoutTests/editing/apply-style-iframe-crash.html 2018-06-02 00:02:51 UTC (rev 232429)
+++ trunk/LayoutTests/editing/apply-style-iframe-crash.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<script>
- function frameLoaded() {
- if (document.counter)
- document.counter++;
- else
- document.counter = 1;
-
- if (document.counter <= 16) {
- document.designMode='on';
- document.execCommand('selectall');
- document.execCommand('italic');
- }
- }
-
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- }
-
- window.addEventListener("load", function() {
- document.getElementById("console").innerText = 'PASS';
- if (window.testRunner)
- testRunner.notifyDone();
- });
-</script>
-
-
-<h1><button><iframe></iframe></button>
-</h1><input><iframe _onload_="frameLoaded()"></iframe>
-
-<div id="console">FAIL</div>
-
-<div>
- WebKit bug #<a href="" Crash applying editing commands from iframe onload event.
-</div>
Deleted: trunk/LayoutTests/editing/composition-underline-color-expected-mismatch.html (232429 => 232430)
--- trunk/LayoutTests/editing/composition-underline-color-expected-mismatch.html 2018-06-02 00:02:51 UTC (rev 232429)
+++ trunk/LayoutTests/editing/composition-underline-color-expected-mismatch.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<style>
- div {
- position: absolute;
- top: 0;
- left: 0;
- }
- #test {
- color: magenta;
- font: 20px/1 Monospace;
- outline: none;
- }
- #overlapping-top {
- background: white;
- width: 100px;
- height: 15px;
- }
- #overlapping-right {
- background: white;
- width: 50px;
- height: 50px;
- left: 50px;
- }
-</style>
-<div contenteditable id="test"></div>
-<!-- The overlapping DIVs are hiding the "^^^^^" characters and the caret to show only the composition underline. -->
-<div id="overlapping-top"></div>
-<div id="overlapping-right"></div>
-<script>
- document.getElementById("test").focus();
- if (window.textInputController)
- textInputController.setMarkedText("^^^^^", 5, 0);
-</script>
Deleted: trunk/LayoutTests/editing/composition-underline-color.html (232429 => 232430)
--- trunk/LayoutTests/editing/composition-underline-color.html 2018-06-02 00:02:51 UTC (rev 232429)
+++ trunk/LayoutTests/editing/composition-underline-color.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<style>
- div {
- position: absolute;
- top: 0;
- left: 0;
- }
- #test {
- color: lime;
- font: 20px/1 Monospace;
- outline: none;
- }
- #overlapping-top {
- background: white;
- width: 100px;
- height: 15px;
- }
- #overlapping-right {
- background: white;
- width: 50px;
- height: 50px;
- left: 50px;
- }
-</style>
-<div contenteditable id="test"></div>
-<!-- The overlapping DIVs are hiding the "^^^^^" characters and the caret to show only the composition underline. -->
-<div id="overlapping-top"></div>
-<div id="overlapping-right"></div>
-<script>
- document.getElementById("test").focus();
- if (window.textInputController)
- textInputController.setMarkedText("^^^^^", 5, 0);
-</script>
Copied: trunk/LayoutTests/editing/input/composition-underline-color-expected-mismatch.html (from rev 232429, trunk/LayoutTests/editing/composition-underline-color-expected-mismatch.html) (0 => 232430)
--- trunk/LayoutTests/editing/input/composition-underline-color-expected-mismatch.html (rev 0)
+++ trunk/LayoutTests/editing/input/composition-underline-color-expected-mismatch.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<style>
+ div {
+ position: absolute;
+ top: 0;
+ left: 0;
+ }
+ #test {
+ color: magenta;
+ font: 20px/1 Monospace;
+ outline: none;
+ }
+ #overlapping-top {
+ background: white;
+ width: 100px;
+ height: 15px;
+ }
+ #overlapping-right {
+ background: white;
+ width: 50px;
+ height: 50px;
+ left: 50px;
+ }
+</style>
+<div contenteditable id="test"></div>
+<!-- The overlapping DIVs are hiding the "^^^^^" characters and the caret to show only the composition underline. -->
+<div id="overlapping-top"></div>
+<div id="overlapping-right"></div>
+<script>
+ document.getElementById("test").focus();
+ if (window.textInputController)
+ textInputController.setMarkedText("^^^^^", 5, 0);
+</script>
Copied: trunk/LayoutTests/editing/input/composition-underline-color.html (from rev 232429, trunk/LayoutTests/editing/composition-underline-color.html) (0 => 232430)
--- trunk/LayoutTests/editing/input/composition-underline-color.html (rev 0)
+++ trunk/LayoutTests/editing/input/composition-underline-color.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<style>
+ div {
+ position: absolute;
+ top: 0;
+ left: 0;
+ }
+ #test {
+ color: lime;
+ font: 20px/1 Monospace;
+ outline: none;
+ }
+ #overlapping-top {
+ background: white;
+ width: 100px;
+ height: 15px;
+ }
+ #overlapping-right {
+ background: white;
+ width: 50px;
+ height: 50px;
+ left: 50px;
+ }
+</style>
+<div contenteditable id="test"></div>
+<!-- The overlapping DIVs are hiding the "^^^^^" characters and the caret to show only the composition underline. -->
+<div id="overlapping-top"></div>
+<div id="overlapping-right"></div>
+<script>
+ document.getElementById("test").focus();
+ if (window.textInputController)
+ textInputController.setMarkedText("^^^^^", 5, 0);
+</script>
Copied: trunk/LayoutTests/editing/input/marked-text-appearance-expected-mismatch.html (from rev 232429, trunk/LayoutTests/editing/marked-text-appearance-expected-mismatch.html) (0 => 232430)
--- trunk/LayoutTests/editing/input/marked-text-appearance-expected-mismatch.html (rev 0)
+++ trunk/LayoutTests/editing/input/marked-text-appearance-expected-mismatch.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<body contenteditable></body>
+<script>
+ document.body.focus();
+ if (window.textInputController) {
+ textInputController.setMarkedText("^^^^^", 0, 5, true);
+ textInputController.insertText("^^^^^");
+ }
+</script>
Copied: trunk/LayoutTests/editing/input/marked-text-appearance.html (from rev 232429, trunk/LayoutTests/editing/marked-text-appearance.html) (0 => 232430)
--- trunk/LayoutTests/editing/input/marked-text-appearance.html (rev 0)
+++ trunk/LayoutTests/editing/input/marked-text-appearance.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<body contenteditable></body>
+<script>
+ document.body.focus();
+ if (window.textInputController)
+ textInputController.setMarkedText("^^^^^", 0, 5, true);
+</script>
Deleted: trunk/LayoutTests/editing/marked-text-appearance-expected-mismatch.html (232429 => 232430)
--- trunk/LayoutTests/editing/marked-text-appearance-expected-mismatch.html 2018-06-02 00:02:51 UTC (rev 232429)
+++ trunk/LayoutTests/editing/marked-text-appearance-expected-mismatch.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<body contenteditable></body>
-<script>
- document.body.focus();
- if (window.textInputController) {
- textInputController.setMarkedText("^^^^^", 0, 5, true);
- textInputController.insertText("^^^^^");
- }
-</script>
Deleted: trunk/LayoutTests/editing/marked-text-appearance.html (232429 => 232430)
--- trunk/LayoutTests/editing/marked-text-appearance.html 2018-06-02 00:02:51 UTC (rev 232429)
+++ trunk/LayoutTests/editing/marked-text-appearance.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -1,7 +0,0 @@
-<!DOCTYPE html>
-<body contenteditable></body>
-<script>
- document.body.focus();
- if (window.textInputController)
- textInputController.setMarkedText("^^^^^", 0, 5, true);
-</script>
Deleted: trunk/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin-expected.txt (232429 => 232430)
--- trunk/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin-expected.txt 2018-06-02 00:02:51 UTC (rev 232429)
+++ trunk/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin-expected.txt 2018-06-02 00:04:43 UTC (rev 232430)
@@ -1,4 +0,0 @@
-Pass if no hang.
- foobar foobar
-
-
Deleted: trunk/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin.html (232429 => 232430)
--- trunk/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin.html 2018-06-02 00:02:51 UTC (rev 232429)
+++ trunk/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>This test that we can jump word by word over rtl-ltr content.</title>
-<meta http-equiv="Content-type" content="text/html; charset=utf-8">
-</head>
-<body contenteditable="true";>
-Pass if no hang.
-<div style="direction: rtl;">‫ foobar foobar‫</div></br>
-<script>
- if (window.testRunner)
- testRunner.dumpAsText();
- getSelection().setPosition(document.querySelector('div').firstChild, 2);
- getSelection().modify('move', 'right', 'word');
- getSelection().modify('move', 'right', 'word');
-</script>
-</body>
-</html>
Copied: trunk/LayoutTests/editing/selection/rtl-to-ltr-editing-word-move-spin-expected.txt (from rev 232429, trunk/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin-expected.txt) (0 => 232430)
--- trunk/LayoutTests/editing/selection/rtl-to-ltr-editing-word-move-spin-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/selection/rtl-to-ltr-editing-word-move-spin-expected.txt 2018-06-02 00:04:43 UTC (rev 232430)
@@ -0,0 +1,4 @@
+Pass if no hang.
+ foobar foobar
+
+
Copied: trunk/LayoutTests/editing/selection/rtl-to-ltr-editing-word-move-spin.html (from rev 232429, trunk/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin.html) (0 => 232430)
--- trunk/LayoutTests/editing/selection/rtl-to-ltr-editing-word-move-spin.html (rev 0)
+++ trunk/LayoutTests/editing/selection/rtl-to-ltr-editing-word-move-spin.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that we can jump word by word over rtl-ltr content.</title>
+<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+</head>
+<body contenteditable="true";>
+Pass if no hang.
+<div style="direction: rtl;">‫ foobar foobar‫</div></br>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ getSelection().setPosition(document.querySelector('div').firstChild, 2);
+ getSelection().modify('move', 'right', 'word');
+ getSelection().modify('move', 'right', 'word');
+</script>
+</body>
+</html>
Copied: trunk/LayoutTests/editing/selection/simple-line-layout-caret-is-gone-expected.txt (from rev 232429, trunk/LayoutTests/editing/simple-line-layout-caret-is-gone-expected.txt) (0 => 232430)
--- trunk/LayoutTests/editing/selection/simple-line-layout-caret-is-gone-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/selection/simple-line-layout-caret-is-gone-expected.txt 2018-06-02 00:04:43 UTC (rev 232430)
@@ -0,0 +1 @@
+36 0 1 18
Copied: trunk/LayoutTests/editing/selection/simple-line-layout-caret-is-gone.html (from rev 232429, trunk/LayoutTests/editing/simple-line-layout-caret-is-gone.html) (0 => 232430)
--- trunk/LayoutTests/editing/selection/simple-line-layout-caret-is-gone.html (rev 0)
+++ trunk/LayoutTests/editing/selection/simple-line-layout-caret-is-gone.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that contenteditable returns the correct caret bounds.</title>
+<style>
+body {
+ margin: 0px;
+}
+
+#editable {
+ -webkit-nbsp-mode: normal !important;
+ -webkit-line-break: auto !important;
+ width: 50px;
+ height: 50px;
+}
+</style>
+</head>
+<body>
+<div id=editable contenteditable=true></div>
+<script>
+editable.focus();
+if (window.testRunner)
+ testRunner.dumpAsText();
+if (window.eventSender) {
+ eventSender.keyDown('\n');
+ eventSender.keyDown('\n');
+}
+if (window.internals) {
+ var withTextCaretRect = internals.absoluteCaretBounds();
+ document.body.innerText = withTextCaretRect.top + " " + withTextCaretRect.left + " " + withTextCaretRect.width + " " + withTextCaretRect.height;
+}
+</script>
+</body>
+</html>
Deleted: trunk/LayoutTests/editing/simple-line-layout-caret-is-gone-expected.txt (232429 => 232430)
--- trunk/LayoutTests/editing/simple-line-layout-caret-is-gone-expected.txt 2018-06-02 00:02:51 UTC (rev 232429)
+++ trunk/LayoutTests/editing/simple-line-layout-caret-is-gone-expected.txt 2018-06-02 00:04:43 UTC (rev 232430)
@@ -1 +0,0 @@
-36 0 1 18
Deleted: trunk/LayoutTests/editing/simple-line-layout-caret-is-gone.html (232429 => 232430)
--- trunk/LayoutTests/editing/simple-line-layout-caret-is-gone.html 2018-06-02 00:02:51 UTC (rev 232429)
+++ trunk/LayoutTests/editing/simple-line-layout-caret-is-gone.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>This tests that contenteditable returns the correct caret bounds.</title>
-<style>
-body {
- margin: 0px;
-}
-
-#editable {
- -webkit-nbsp-mode: normal !important;
- -webkit-line-break: auto !important;
- width: 50px;
- height: 50px;
-}
-</style>
-</head>
-<body>
-<div id=editable contenteditable=true></div>
-<script>
-editable.focus();
-if (window.testRunner)
- testRunner.dumpAsText();
-if (window.eventSender) {
- eventSender.keyDown('\n');
- eventSender.keyDown('\n');
-}
-if (window.internals) {
- var withTextCaretRect = internals.absoluteCaretBounds();
- document.body.innerText = withTextCaretRect.top + " " + withTextCaretRect.left + " " + withTextCaretRect.width + " " + withTextCaretRect.height;
-}
-</script>
-</body>
-</html>
Copied: trunk/LayoutTests/editing/style/apply-style-iframe-crash-expected.txt (from rev 232429, trunk/LayoutTests/editing/apply-style-iframe-crash-expected.txt) (0 => 232430)
--- trunk/LayoutTests/editing/style/apply-style-iframe-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/style/apply-style-iframe-crash-expected.txt 2018-06-02 00:04:43 UTC (rev 232430)
@@ -0,0 +1,4 @@
+
+
+PASS
+WebKit bug #132103: Crash applying editing commands from iframe onload event.
Copied: trunk/LayoutTests/editing/style/apply-style-iframe-crash.html (from rev 232429, trunk/LayoutTests/editing/apply-style-iframe-crash.html) (0 => 232430)
--- trunk/LayoutTests/editing/style/apply-style-iframe-crash.html (rev 0)
+++ trunk/LayoutTests/editing/style/apply-style-iframe-crash.html 2018-06-02 00:04:43 UTC (rev 232430)
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<script>
+ function frameLoaded() {
+ if (document.counter)
+ document.counter++;
+ else
+ document.counter = 1;
+
+ if (document.counter <= 16) {
+ document.designMode='on';
+ document.execCommand('selectall');
+ document.execCommand('italic');
+ }
+ }
+
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ window.addEventListener("load", function() {
+ document.getElementById("console").innerText = 'PASS';
+ if (window.testRunner)
+ testRunner.notifyDone();
+ });
+</script>
+
+
+<h1><button><iframe></iframe></button>
+</h1><input><iframe _onload_="frameLoaded()"></iframe>
+
+<div id="console">FAIL</div>
+
+<div>
+ WebKit bug #<a href="" Crash applying editing commands from iframe onload event.
+</div>
