[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

Sat Sep 26 08:33:51 UTC 2009

The following commit has been merged in the debian/unstable branch:
commit 3f2b2f9b07cb38b4239bea9e6e3adfa19427ccfd
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 9 20:18:59 2004 +0000

            Reviewed by me
    
            Added one more layout test for editing.
    
            * layout-tests/editing/deleting/delete-3608445-fix-expected.txt: Added.
            * layout-tests/editing/deleting/delete-3608445-fix.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6348 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/editing/deleting/delete-3608445-fix-expected.txt b/LayoutTests/editing/deleting/delete-3608445-fix-expected.txt
new file mode 100644
index 0000000..87682eb
--- /dev/null
+++ b/LayoutTests/editing/deleting/delete-3608445-fix-expected.txt
@@ -0,0 +1,20 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+layer at (0,0) size 800x128
+  RenderBlock {HTML} at (0,0) size 800x128
+    RenderBody {BODY} at (8,8) size 784x112
+      RenderBlock {DIV} at (0,0) size 784x112 [border: (2px solid #FF0000)]
+        RenderInline {SPAN} at (0,0) size 205x84
+          RenderText {TEXT} at (14,14) size 15x28
+            text run at (14,14) width 15: "s "
+          RenderBR {BR} at (0,0) size 0x0
+          RenderText {TEXT} at (0,0) size 0x0
+          RenderBR {BR} at (14,42) size 0x28
+          RenderText {TEXT} at (14,70) size 205x28
+            text run at (14,70) width 94: " war. We "
+            text run at (108,70) width 111: "of that war."
+        RenderText {TEXT} at (0,0) size 0x0
+selection is CARET:
+start:      position 0 of child 5 {TEXT} of child 2 {SPAN} of root {DIV}
+upstream:   position 1 of child 4 {BR} of child 2 {SPAN} of root {DIV}
+downstream: position 0 of child 5 {TEXT} of child 2 {SPAN} of root {DIV}
diff --git a/LayoutTests/editing/deleting/delete-trailing-ws-002.html b/LayoutTests/editing/deleting/delete-3608445-fix.html
similarity index 80%
copy from LayoutTests/editing/deleting/delete-trailing-ws-002.html
copy to LayoutTests/editing/deleting/delete-3608445-fix.html
index 3b61c06..d15c7a6 100644
--- a/LayoutTests/editing/deleting/delete-trailing-ws-002.html
+++ b/LayoutTests/editing/deleting/delete-3608445-fix.html
@@ -13,10 +13,10 @@
 <script>
 
 function editingTest() {
-    for (i = 0; i < 7; i++) {
+    for (i = 0; i < 8; i++) {
         moveSelectionForwardByCharacterCommand();    
     }
-    for (i = 0; i < 3; i++) {
+    for (i = 0; i < 4; i++) {
         deleteCommand(); 
     }
 }
@@ -27,7 +27,8 @@ function editingTest() {
 </head> 
 <body>
 <div contenteditable id="root" class="editing">
-<span id="test">foo<br>bar baz</span>
+<span id="test">s <br>
+<br>that war. We  of that war.</span>
 </div>
 
 <script>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 237e47f..1166fbc 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-04-09  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by me
+        
+        Added one more layout test for editing.
+
+        * layout-tests/editing/deleting/delete-3608445-fix-expected.txt: Added.
+        * layout-tests/editing/deleting/delete-3608445-fix.html: Added.
+
 2004-04-08  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by John.

-- 
WebKit Debian packaging

