[webkit-changes] cvs commit: LayoutTests/editing/deleting
delete-block-merge-contents-019-expected.txt
delete-block-merge-contents-019.html
delete-line-011-expected.txt delete-line-012-expected.txt
David
harrison at opensource.apple.com
Mon Nov 14 11:53:59 PST 2005
harrison 05/11/14 11:53:59
Modified: . ChangeLog
editing/deleting
delete-block-merge-contents-019-expected.txt
delete-block-merge-contents-019.html
delete-line-011-expected.txt
delete-line-012-expected.txt
Log:
<rdar://problem/4337532> Paragraph concatenation fails
Fix these tests to check for same behavior as in TextEdit.
* editing/deleting/delete-block-merge-contents-019-expected.txt:
* editing/deleting/delete-block-merge-contents-019.html:
* editing/deleting/delete-line-011-expected.txt:
* editing/deleting/delete-line-012-expected.txt:
Revision Changes Path
1.89 +11 -0 LayoutTests/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/LayoutTests/ChangeLog,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- ChangeLog 14 Nov 2005 09:55:14 -0000 1.88
+++ ChangeLog 14 Nov 2005 19:53:58 -0000 1.89
@@ -1,3 +1,14 @@
+2005-11-14 David Harrison <harrison at apple.com>
+
+ <rdar://problem/4337532> Paragraph concatenation fails
+
+ Fix these tests to check for same behavior as in TextEdit.
+
+ * editing/deleting/delete-block-merge-contents-019-expected.txt:
+ * editing/deleting/delete-block-merge-contents-019.html:
+ * editing/deleting/delete-line-011-expected.txt:
+ * editing/deleting/delete-line-012-expected.txt:
+
2005-11-14 Anders Carlsson <andersca at mac.com>
* ChangeLog: Add bug numbers for recent fixes.
1.6 +8 -10 LayoutTests/editing/deleting/delete-block-merge-contents-019-expected.txt
Index: delete-block-merge-contents-019-expected.txt
===================================================================
RCS file: /cvs/root/LayoutTests/editing/deleting/delete-block-merge-contents-019-expected.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- delete-block-merge-contents-019-expected.txt 15 Aug 2005 03:39:29 -0000 1.5
+++ delete-block-merge-contents-019-expected.txt 14 Nov 2005 19:53:58 -0000 1.6
@@ -12,14 +12,12 @@
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #0000FF)]
- RenderText {TEXT} at (14,14) size 652x28
- text run at (14,14) width 652: "Should see \"X\" in top red box, followed by \"X\", in its own red box."
- RenderBlock {DIV} at (0,80) size 784x112
- RenderBlock {DIV} at (0,0) size 784x112 [border: (2px solid #FF0000)]
- RenderBlock (anonymous) at (14,14) size 756x28
- RenderText {TEXT} at (0,0) size 17x28
- text run at (0,0) width 17: "X"
- RenderBlock {DIV} at (14,42) size 756x56 [border: (2px solid #FF0000)]
- RenderText {TEXT} at (14,14) size 17x28
- text run at (14,14) width 17: "X"
+ RenderText {TEXT} at (14,14) size 292x28
+ text run at (14,14) width 292: "Should see \"XX\" in a red box."
+ RenderBlock {DIV} at (0,80) size 784x56
+ RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
+ RenderText {TEXT} at (14,14) size 17x28
+ text run at (14,14) width 17: "X"
+ RenderText {TEXT} at (31,14) size 17x28
+ text run at (31,14) width 17: "X"
caret: position 2 of child 0 {TEXT} of child 1 {DIV} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document
1.2 +2 -6 LayoutTests/editing/deleting/delete-block-merge-contents-019.html
Index: delete-block-merge-contents-019.html
===================================================================
RCS file: /cvs/root/LayoutTests/editing/deleting/delete-block-merge-contents-019.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- delete-block-merge-contents-019.html 12 Jan 2005 17:55:08 -0000 1.1
+++ delete-block-merge-contents-019.html 14 Nov 2005 19:53:58 -0000 1.2
@@ -29,9 +29,9 @@
<title>Editing Test</title>
</head>
-<body contenteditable="true">
+<body contenteditable="true" onload="runEditingTest()">
<div class="explanation">
-Should see "X" in top red box, followed by "X", in its own red box.
+Should see "XX" in a red box.
</div>
<div id="root" style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space;">
@@ -43,9 +43,5 @@
</div>
</div>
-<script>
-runEditingTest();
-</script>
-
</body>
</html>
1.6 +2 -3 LayoutTests/editing/deleting/delete-line-011-expected.txt
Index: delete-line-011-expected.txt
===================================================================
RCS file: /cvs/root/LayoutTests/editing/deleting/delete-line-011-expected.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- delete-line-011-expected.txt 15 Aug 2005 03:39:30 -0000 1.5
+++ delete-line-011-expected.txt 14 Nov 2005 19:53:58 -0000 1.6
@@ -33,7 +33,6 @@
RenderBlock {DIV} at (0,0) size 600x28
RenderText {TEXT} at (0,0) size 96x28
text run at (0,0) width 96: "There is a"
- RenderBlock {DIV} at (0,28) size 600x28
- RenderText {TEXT} at (0,0) size 241x28
- text run at (0,0) width 241: "Which taken at the flood"
+ RenderText {TEXT} at (96,0) size 241x28
+ text run at (96,0) width 241: "Which taken at the flood"
caret: position 10 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
1.6 +2 -3 LayoutTests/editing/deleting/delete-line-012-expected.txt
Index: delete-line-012-expected.txt
===================================================================
RCS file: /cvs/root/LayoutTests/editing/deleting/delete-line-012-expected.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- delete-line-012-expected.txt 15 Aug 2005 03:39:30 -0000 1.5
+++ delete-line-012-expected.txt 14 Nov 2005 19:53:58 -0000 1.6
@@ -33,7 +33,6 @@
RenderBlock {DIV} at (0,0) size 600x28
RenderText {TEXT} at (0,0) size 96x28
text run at (0,0) width 96: "There is a"
- RenderBlock {DIV} at (0,28) size 600x28
- RenderText {TEXT} at (0,0) size 241x28
- text run at (0,0) width 241: "Which taken at the flood"
+ RenderText {TEXT} at (96,0) size 241x28
+ text run at (96,0) width 241: "Which taken at the flood"
caret: position 10 of child 0 {TEXT} of child 1 {DIV} of child 1 {BODY} of child 0 {HTML} of document
More information about the webkit-changes
mailing list