git://git.webkit.org / WebKit-https.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b434c18)
Reviewed by John
authorkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Nov 2004 15:28:56 +0000 (15:28 +0000)
committerkocienda <kocienda@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 11 Nov 2004 15:28:56 +0000 (15:28 +0000)
        Updated some layout test results that changed as a result of my last checking.
        Added a new test that has been in my tree for a few days.

        * layout-tests/editing/deleting/delete-3775172-fix-expected.txt:
        * layout-tests/editing/deleting/delete-3800834-fix-expected.txt:
        * layout-tests/editing/inserting/insert-3851164-fix-expected.txt: Added.
        * layout-tests/editing/inserting/insert-3851164-fix.html: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7973 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/editing/deleting/delete-3775172-fix-expected.txt patch | blob | history
LayoutTests/editing/deleting/delete-3800834-fix-expected.txt patch | blob | history
LayoutTests/editing/inserting/insert-3851164-fix-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/editing/inserting/insert-3851164-fix.html [new file with mode: 0644] patch | blob
WebCore/ChangeLog-2005-08-23 patch | blob | history

diff --git a/LayoutTests/editing/deleting/delete-3775172-fix-expected.txt b/LayoutTests/editing/deleting/delete-3775172-fix-expected.txt
index 6cfb5ec80c858f676198937bc2053f7ad1fd1b8b..adea112bdad643deb9a00046b7fde6bec247fcf8 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3775172-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3775172-fix-expected.txt
@@ -3,9 +3,7 @@ layer 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 {DIV} at (0,0) size 784x18
-        RenderBR {BR} at (0,0) size 0x18
 selection is CARET:
-start:      position 0 of child 1 {BR} of root {DIV}
-upstream:   position 0 of  of root {DIV}
-downstream: position 0 of child 1 {BR} of root {DIV}
+start:      position 0 of child 2 {BODY} of child 1 {HTML} of root {}
+upstream:   position 0 of child 2 {BODY} of child 1 {HTML} of root {}
+downstream: position 1 of child 2 {TEXT} of child 2 {BODY} of child 1 {HTML} of root {}
diff --git a/LayoutTests/editing/deleting/delete-3800834-fix-expected.txt b/LayoutTests/editing/deleting/delete-3800834-fix-expected.txt
index 1f8736344abd29b3d6acff03897120bfe5a464ca..757c9bb532d27fe06d548dd1eae35000c89a34a6 100644 (file)
--- a/LayoutTests/editing/deleting/delete-3800834-fix-expected.txt
+++ b/LayoutTests/editing/deleting/delete-3800834-fix-expected.txt
@@ -13,6 +13,7 @@ layer at (0,0) size 800x600
           RenderBlock {BLOCKQUOTE} at (40,0) size 676x0
         RenderBlock (anonymous) at (14,66) size 756x0
           RenderInline {SPAN} at (0,0) size 0x0
+          RenderText {TEXT} at (0,0) size 0x0
 selection is CARET:
 start:      position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
 upstream:   position 3 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
diff --git a/LayoutTests/editing/inserting/insert-3851164-fix-expected.txt b/LayoutTests/editing/inserting/insert-3851164-fix-expected.txt
new file mode 100644 (file)
index 0000000..8186cb0
--- /dev/null
+++ b/LayoutTests/editing/inserting/insert-3851164-fix-expected.txt
@@ -0,0 +1,15 @@
+layer at (0,0) size 800x600
+  RenderCanvas 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 (anonymous) at (0,0) size 784x28
+        RenderInline {SPAN} at (0,0) size 12x28
+          RenderText {TEXT} at (0,0) size 12x28
+            text run at (0,0) width 12: "x"
+        RenderText {TEXT} at (0,0) size 0x0
+        RenderText {TEXT} at (0,0) size 0x0
+selection is CARET:
+start:      position 1 of child 1 {TEXT} of child 1 {SPAN} of root {BODY}
+upstream:   position 1 of child 1 {TEXT} of child 1 {SPAN} of root {BODY}
+downstream: position 1 of child 3 {TEXT} of root {BODY}
diff --git a/LayoutTests/editing/inserting/insert-3851164-fix.html b/LayoutTests/editing/inserting/insert-3851164-fix.html
new file mode 100644 (file)
index 0000000..e932a30
--- /dev/null
+++ b/LayoutTests/editing/inserting/insert-3851164-fix.html
@@ -0,0 +1,32 @@
+<html> 
+<head>
+
+<style>
+.editing { 
+    word-wrap: break-word; 
+    -khtml-nbsp-mode: space; 
+    -khtml-line-break: after-white-space;
+}
+</style>
+<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
+
+<script>
+
+function editingTest() {
+    selectAllCommand();
+    deleteCommand();
+    typeCharacterCommand();
+}
+
+</script>
+
+<title>Editing Test</title> 
+</head> 
+<body contenteditable id="root" class="editing"><P style="margin: 0.0px 0.0px 0.0px 0.0px; font: 24.0px Gill Sans">@@ -571,6 +607,7 @@</P>
+
+<script>
+runEditingTest();
+</script>
+
+</body>
+</html>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 493eb9d7d87bc85cd25882dd31cf14ba05198e39..602c2abe7ea9263f5f36051a3d37d1946e0b88ed 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,4 +1,16 @@
-2004-11-10  Ken Kocienda  <kocienda@apple.com>
+2004-11-11  Ken Kocienda  <kocienda@apple.com>
+
+        Reviewed by John
+        
+        Updated some layout test results that changed as a result of my last checking.
+        Added a new test that has been in my tree for a few days.
+
+        * layout-tests/editing/deleting/delete-3775172-fix-expected.txt:
+        * layout-tests/editing/deleting/delete-3800834-fix-expected.txt:
+        * layout-tests/editing/inserting/insert-3851164-fix-expected.txt: Added.
+        * layout-tests/editing/inserting/insert-3851164-fix.html: Added.
+
+2004-11-11  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by John
 
Mirror of the WebKit open source project from svn.webkit.org.