Diff
Modified: trunk/LayoutTests/ChangeLog (142558 => 142559)
--- trunk/LayoutTests/ChangeLog 2013-02-12 01:29:07 UTC (rev 142558)
+++ trunk/LayoutTests/ChangeLog 2013-02-12 01:31:36 UTC (rev 142559)
@@ -1,3 +1,28 @@
+2013-02-11 Ryosuke Niwa <[email protected]>
+
+ Move deletionUI tests into platform/mac
+ https://bugs.webkit.org/show_bug.cgi?id=109517
+
+ Reviewed by Benjamin Poulain.
+
+ Moved deletionUI tests into platform/mac since Mac is the only port that ships this feature.
+
+ * editing/deleting/5408255-expected.txt: Removed.
+ * editing/deleting/5408255.html: Removed.
+ * editing/deleting/deletionUI-single-instance.html: Removed.
+ * platform/chromium/editing/deleting/deletionUI-single-instance-expected.png: Removed.
+ * platform/chromium/editing/deleting/deletionUI-single-instance-expected.txt: Removed.
+ * platform/efl/TestExpectations:
+ * platform/mac/editing/deleting/deletionUI-click-on-delete-button-expected.txt: Copied from LayoutTests/editing/deleting/5408255-expected.txt.
+ * platform/mac/editing/deleting/deletionUI-click-on-delete-button.html: Copied from LayoutTests/editing/deleting/5408255.html.
+ * platform/mac/editing/deleting/deletionUI-single-instance.html: Copied from LayoutTests/editing/deleting/deletionUI-single-instance.html.
+ * platform/qt-mac/TestExpectations:
+ * platform/qt/editing/deleting/deletionUI-single-instance-expected.png: Removed.
+ * platform/qt/editing/deleting/deletionUI-single-instance-expected.txt: Removed.
+ * platform/win/TestExpectations:
+ * platform/wincairo/TestExpectations:
+ * platform/wk2/TestExpectations:
+
2013-02-11 Adam Barth <[email protected]>
Load event fires too early with threaded HTML parser (take 2)
Deleted: trunk/LayoutTests/editing/deleting/5408255-expected.txt (142558 => 142559)
--- trunk/LayoutTests/editing/deleting/5408255-expected.txt 2013-02-12 01:29:07 UTC (rev 142558)
+++ trunk/LayoutTests/editing/deleting/5408255-expected.txt 2013-02-12 01:31:36 UTC (rev 142559)
@@ -1,5 +0,0 @@
-There should be no visible content in the markup below. This test is for a bug where the delete button wouldn't work because it had -webkit-user-select:none instead of -webkit-user-select:ignore.
-| "
-"
-| "
-"
Deleted: trunk/LayoutTests/editing/deleting/5408255.html (142558 => 142559)
--- trunk/LayoutTests/editing/deleting/5408255.html 2013-02-12 01:29:07 UTC (rev 142558)
+++ trunk/LayoutTests/editing/deleting/5408255.html 2013-02-12 01:31:36 UTC (rev 142559)
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-
-<div id="test" contenteditable="true" style="padding: 1em;">
-<ul class="needsDeletionUI"><li>1</li><li id="li">2</li></ul>
-</div>
-
-<script src=""
-<script>
-
-sel = window.getSelection();
-li = document.getElementById("li");
-sel.setPosition(li, 0);
-
-if (window.testRunner) {
- deleteButton = document.getElementById("WebKit-Editing-Delete-Button");
- x = deleteButton.offsetParent.offsetLeft + deleteButton.offsetParent.offsetParent.offsetLeft + deleteButton.offsetLeft + deleteButton.offsetWidth / 2;
- y = deleteButton.offsetParent.offsetTop + deleteButton.offsetParent.offsetParent.offsetTop + deleteButton.offsetTop + deleteButton.offsetHeight / 2;
- eventSender.mouseMoveTo(x, y);
- eventSender.mouseDown();
- eventSender.mouseUp();
- deleteButton = document.getElementById("WebKit-Editing-Delete-Button");
- testContainer = document.getElementById("test");
- Markup.description("There should be no visible content in the markup below. This test is for a bug where the delete button wouldn't work because it had -webkit-user-select:none instead of -webkit-user-select:ignore.");
- if (deleteButton)
- testContainer.innerHTML += "FAIL";
- Markup.dump("test");
-}
-
-</script>
-</body>
-</html>
Deleted: trunk/LayoutTests/editing/deleting/deletionUI-single-instance.html (142558 => 142559)
--- trunk/LayoutTests/editing/deleting/deletionUI-single-instance.html 2013-02-12 01:29:07 UTC (rev 142558)
+++ trunk/LayoutTests/editing/deleting/deletionUI-single-instance.html 2013-02-12 01:31:36 UTC (rev 142559)
@@ -1,32 +0,0 @@
-<body>
-
-<p>
-This test can only be run with DRT and not manually from the browser. This test makes sure that we don't make the mistake of adding new m_containerElements to the DeletionUI over and over again.
-A successful run of the test will not have multiple instances of deletion UI render objects at the same coordinates:
-</p>
-
-<div contenteditable="true" style="padding: 1em;">
-<table class="needsDeletionUI">
-
-<tr>
-<td id="td">
-Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas odio. Morbi sed tortor id nisl bibendum commodo. Donec pede. Praesent accumsan dui vitae mauris. Mauris non dui at neque lacinia pulvinar. Quisque nibh. Nulla vitae lectus. Pellentesque enim. Mauris hendrerit molestie dui. Etiam pretium ligula a pede. Fusce consectetuer purus sit amet sem. Morbi tincidunt mollis libero. Maecenas molestie.
-</td>
-</tr>
-</table>
-
-</div>
-
-<script>
-
-sel = window.getSelection();
-td = document.getElementById("td");
-sel.setPosition(td, td.textContent.length);
-
-if (window.testRunner) {
- for (i = 0; i < 5; i++)
- document.execCommand("Delete");
-}
-
-</script>
-</body>
Deleted: trunk/LayoutTests/platform/chromium/editing/deleting/deletionUI-single-instance-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium/editing/deleting/deletionUI-single-instance-expected.txt (142558 => 142559)
--- trunk/LayoutTests/platform/chromium/editing/deleting/deletionUI-single-instance-expected.txt 2013-02-12 01:29:07 UTC (rev 142558)
+++ trunk/LayoutTests/platform/chromium/editing/deleting/deletionUI-single-instance-expected.txt 2013-02-12 01:31:36 UTC (rev 142559)
@@ -1,34 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x54
- RenderText {#text} at (0,0) size 782x54
- text run at (0,0) width 457: "This test can only be run with DRT and not manually from the browser. "
- text run at (457,0) width 325: "This test makes sure that we don't make the mistake"
- text run at (0,18) width 738: "of adding new m_containerElements to the DeletionUI over and over again. A successful run of the test will not have"
- text run at (0,36) width 450: "multiple instances of deletion UI render objects at the same coordinates:"
- RenderBlock {DIV} at (0,70) size 784x114
-layer at (24,94) size 752x82 layerType: background only
-layer at (20,90) size 760x90
- RenderBlock (positioned) zI: -1000000 {DIV} at (-4,-4) size 760x90 [border: (4px solid #00000099)]
-layer at (24,94) size 752x82 layerType: foreground only
- RenderTable {TABLE} at (16,16) size 752x82
- RenderTableSection {TBODY} at (0,0) size 752x78
- RenderTableRow {TR} at (0,2) size 752x74
- RenderTableCell {TD} at (2,2) size 748x74 [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (1,1) size 746x72
- text run at (1,1) width 743: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas odio. Morbi sed tortor id nisl bibendum commodo."
- text run at (744,1) width 3: " "
- text run at (1,19) width 739: "Donec pede. Praesent accumsan dui vitae mauris. Mauris non dui at neque lacinia pulvinar. Quisque nibh. Nulla vitae"
- text run at (740,19) width 4: " "
- text run at (1,37) width 715: "lectus. Pellentesque enim. Mauris hendrerit molestie dui. Etiam pretium ligula a pede. Fusce consectetuer purus sit"
- text run at (716,37) width 4: " "
- text run at (1,55) width 353: "amet sem. Morbi tincidunt mollis libero. Maecenas mole"
- RenderTableSection (anonymous) at (0,78) size 752x4
- RenderTableRow (anonymous) at (0,2) size 752x0
- RenderTableCell (anonymous) at (2,2) size 748x0 [r=0 c=0 rs=1 cs=1]
-layer at (7,79) size 30x30
- RenderImage zI: 1000000 {IMG} at (-17,-15) size 30x30
-caret: position 403 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of body
Modified: trunk/LayoutTests/platform/efl/TestExpectations (142558 => 142559)
--- trunk/LayoutTests/platform/efl/TestExpectations 2013-02-12 01:29:07 UTC (rev 142558)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2013-02-12 01:31:36 UTC (rev 142559)
@@ -1432,10 +1432,6 @@
# EFL's LayoutTestController does not implement setAutomaticLinkDetectionEnabled
webkit.org/b/85463 editing/inserting/typing-space-to-trigger-smart-link.html
-# Missing deletebutton controller implementation.
-webkit.org/b/86615 editing/deleting/5408255.html [ Failure ]
-webkit.org/b/86615 editing/deleting/regional-indicators.html [ Failure ]
-
# Tests failing due to rounding problems in colors inside pixman
webkit.org/b/49964 fast/canvas/canvas-fillPath-shadow.html [ Failure ]
Copied: trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-click-on-delete-button-expected.txt (from rev 142551, trunk/LayoutTests/editing/deleting/5408255-expected.txt) (0 => 142559)
--- trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-click-on-delete-button-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-click-on-delete-button-expected.txt 2013-02-12 01:31:36 UTC (rev 142559)
@@ -0,0 +1,5 @@
+There should be no visible content in the markup below. This test is for a bug where the delete button wouldn't work because it had -webkit-user-select:none instead of -webkit-user-select:ignore.
+| "
+"
+| "
+"
Copied: trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-click-on-delete-button.html (from rev 142542, trunk/LayoutTests/editing/deleting/5408255.html) (0 => 142559)
--- trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-click-on-delete-button.html (rev 0)
+++ trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-click-on-delete-button.html 2013-02-12 01:31:36 UTC (rev 142559)
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<body>
+
+<div id="test" contenteditable="true" style="padding: 1em;">
+<ul class="needsDeletionUI"><li>1</li><li id="li">2</li></ul>
+</div>
+
+<script src=""
+<script>
+
+sel = window.getSelection();
+li = document.getElementById("li");
+sel.setPosition(li, 0);
+
+if (window.testRunner) {
+ deleteButton = document.getElementById("WebKit-Editing-Delete-Button");
+ x = deleteButton.offsetParent.offsetLeft + deleteButton.offsetParent.offsetParent.offsetLeft + deleteButton.offsetLeft + deleteButton.offsetWidth / 2;
+ y = deleteButton.offsetParent.offsetTop + deleteButton.offsetParent.offsetParent.offsetTop + deleteButton.offsetTop + deleteButton.offsetHeight / 2;
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ deleteButton = document.getElementById("WebKit-Editing-Delete-Button");
+ testContainer = document.getElementById("test");
+ Markup.description("There should be no visible content in the markup below. This test is for a bug where the delete button wouldn't work because it had -webkit-user-select:none instead of -webkit-user-select:ignore.");
+ if (deleteButton)
+ testContainer.innerHTML += "FAIL";
+ Markup.dump("test");
+}
+
+</script>
+</body>
+</html>
Copied: trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-single-instance.html (from rev 142542, trunk/LayoutTests/editing/deleting/deletionUI-single-instance.html) (0 => 142559)
--- trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-single-instance.html (rev 0)
+++ trunk/LayoutTests/platform/mac/editing/deleting/deletionUI-single-instance.html 2013-02-12 01:31:36 UTC (rev 142559)
@@ -0,0 +1,32 @@
+<body>
+
+<p>
+This test can only be run with DRT and not manually from the browser. This test makes sure that we don't make the mistake of adding new m_containerElements to the DeletionUI over and over again.
+A successful run of the test will not have multiple instances of deletion UI render objects at the same coordinates:
+</p>
+
+<div contenteditable="true" style="padding: 1em;">
+<table class="needsDeletionUI">
+
+<tr>
+<td id="td">
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas odio. Morbi sed tortor id nisl bibendum commodo. Donec pede. Praesent accumsan dui vitae mauris. Mauris non dui at neque lacinia pulvinar. Quisque nibh. Nulla vitae lectus. Pellentesque enim. Mauris hendrerit molestie dui. Etiam pretium ligula a pede. Fusce consectetuer purus sit amet sem. Morbi tincidunt mollis libero. Maecenas molestie.
+</td>
+</tr>
+</table>
+
+</div>
+
+<script>
+
+sel = window.getSelection();
+td = document.getElementById("td");
+sel.setPosition(td, td.textContent.length);
+
+if (window.testRunner) {
+ for (i = 0; i < 5; i++)
+ document.execCommand("Delete");
+}
+
+</script>
+</body>
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/deletionUI-single-instance-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/deletionUI-single-instance-expected.txt (142558 => 142559)
--- trunk/LayoutTests/platform/qt/editing/deleting/deletionUI-single-instance-expected.txt 2013-02-12 01:29:07 UTC (rev 142558)
+++ trunk/LayoutTests/platform/qt/editing/deleting/deletionUI-single-instance-expected.txt 2013-02-12 01:31:36 UTC (rev 142559)
@@ -1,34 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x57
- RenderText {#text} at (0,0) size 759x57
- text run at (0,0) width 430: "This test can only be run with DRT and not manually from the browser. "
- text run at (430,0) width 329: "This test makes sure that we don't make the mistake of"
- text run at (0,19) width 730: "adding new m_containerElements to the DeletionUI over and over again. A successful run of the test will not have multiple"
- text run at (0,38) width 381: "instances of deletion UI render objects at the same coordinates:"
- RenderBlock {DIV} at (0,73) size 784x118
-layer at (24,97) size 752x86 layerType: background only
-layer at (20,93) size 760x94
- RenderBlock (positioned) zI: -1000000 {DIV} at (-4,-4) size 760x94 [border: (4px solid #00000099)]
-layer at (24,97) size 752x86 layerType: foreground only
- RenderTable {TABLE} at (16,16) size 752x86
- RenderTableSection {TBODY} at (0,0) size 752x82
- RenderTableRow {TR} at (0,2) size 752x78
- RenderTableCell {TD} at (2,2) size 748x78 [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (1,1) size 746x76
- text run at (1,1) width 713: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas odio. Morbi sed tortor id nisl bibendum commodo."
- text run at (714,1) width 4: " "
- text run at (1,20) width 740: "Donec pede. Praesent accumsan dui vitae mauris. Mauris non dui at neque lacinia pulvinar. Quisque nibh. Nulla vitae lectus."
- text run at (741,20) width 4: " "
- text run at (1,39) width 744: "Pellentesque enim. Mauris hendrerit molestie dui. Etiam pretium ligula a pede. Fusce consectetuer purus sit amet sem. Morbi"
- text run at (745,39) width 2: " "
- text run at (1,58) width 229: "tincidunt mollis libero. Maecenas mole"
- RenderTableSection (anonymous) at (0,82) size 752x4
- RenderTableRow (anonymous) at (0,2) size 752x0
- RenderTableCell (anonymous) at (2,2) size 748x0 [r=0 c=0 rs=1 cs=1]
-layer at (7,82) size 30x30
- RenderImage zI: 1000000 {IMG} at (-17,-15) size 30x30
-caret: position 403 of child 0 {#text} of child 1 {TD} of child 0 {TR} of child 1 {TBODY} of child 1 {TABLE} of child 3 {DIV} of body
Modified: trunk/LayoutTests/platform/qt-mac/TestExpectations (142558 => 142559)
--- trunk/LayoutTests/platform/qt-mac/TestExpectations 2013-02-12 01:29:07 UTC (rev 142558)
+++ trunk/LayoutTests/platform/qt-mac/TestExpectations 2013-02-12 01:31:36 UTC (rev 142559)
@@ -588,7 +588,6 @@
editing/deleting/5272440.html
editing/deleting/5300379.html
editing/deleting/5369009.html
-editing/deleting/5408255.html
editing/deleting/5433862-2.html
editing/deleting/5483370.html
editing/deleting/delete-3608445-fix.html
@@ -4928,7 +4927,6 @@
editing/deleting/delete-ws-fixup-002.html
editing/deleting/delete-ws-fixup-003.html
editing/deleting/delete-ws-fixup-004.html
-editing/deleting/deletionUI-single-instance.html
editing/deleting/forward-delete.html
editing/deleting/smart-delete-002.html
editing/selection/7152-1.html
Modified: trunk/LayoutTests/platform/win/TestExpectations (142558 => 142559)
--- trunk/LayoutTests/platform/win/TestExpectations 2013-02-12 01:29:07 UTC (rev 142558)
+++ trunk/LayoutTests/platform/win/TestExpectations 2013-02-12 01:31:36 UTC (rev 142559)
@@ -571,8 +571,6 @@
fast/table/giantCellspacing.html
# Not investigated yet
-editing/deleting/5408255.html
-editing/deleting/deletionUI-single-instance.html
editing/pasteboard/input-field-1.html
editing/selection/contains-boundaries.html
editing/undo/5378473.html
Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (142558 => 142559)
--- trunk/LayoutTests/platform/wincairo/TestExpectations 2013-02-12 01:29:07 UTC (rev 142558)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations 2013-02-12 01:31:36 UTC (rev 142559)
@@ -1092,8 +1092,6 @@
fast/table/giantCellspacing.html
# Not investigated yet
-editing/deleting/5408255.html
-editing/deleting/deletionUI-single-instance.html
editing/pasteboard/input-field-1.html
editing/selection/contains-boundaries.html
editing/undo/5378473.html
Modified: trunk/LayoutTests/platform/wk2/TestExpectations (142558 => 142559)
--- trunk/LayoutTests/platform/wk2/TestExpectations 2013-02-12 01:29:07 UTC (rev 142558)
+++ trunk/LayoutTests/platform/wk2/TestExpectations 2013-02-12 01:31:36 UTC (rev 142559)
@@ -177,8 +177,8 @@
# WebKitTestRunner needs to support needsDeletionUI mechanism to show deletion UI
# <https://bugs.webkit.org/show_bug.cgi?id=42535>
fast/dom/Element/id-in-deletebutton.html
-editing/deleting/5408255.html
-editing/deleting/deletionUI-single-instance.html
+platform/mac/editing/deleting/deletionUI-click-on-delete-button.html
+platform/mac/editing/deleting/deletionUI-single-instance.html
platform/mac/editing/deleting/deletionUI-borders.html
platform/mac/editing/deleting/deletionUI-differing-background.html
platform/mac/editing/deleting/deletionUI-minimum-size.html
