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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 4d850f6a7a6acaf69235c9788beed2c49bc6003f
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 9 23:23:06 2004 +0000

            Reviewed by me
    
            Updated some layout test results.
    
            * layout-tests/editing/deleting/delete-image-004-expected.txt:
            * layout-tests/editing/selection/extend-by-character-006-expected.txt:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6992 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/editing/deleting/delete-image-004-expected.txt b/LayoutTests/editing/deleting/delete-image-004-expected.txt
index 4c9ffa5..658c9f7 100644
--- a/LayoutTests/editing/deleting/delete-image-004-expected.txt
+++ b/LayoutTests/editing/deleting/delete-image-004-expected.txt
@@ -3,16 +3,8 @@ 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 784x137 [border: (2px solid #FF0000)]
-        RenderInline {SPAN} at (0,0) size 158x28
-          RenderText {TEXT} at (0,0) size 0x0
-          RenderImage {IMG} at (14,14) size 76x103
-          RenderText {TEXT} at (90,95) size 6x28
-            text run at (90,95) width 6: " "
-          RenderImage {IMG} at (96,14) size 76x103
-          RenderText {TEXT} at (0,0) size 0x0
-        RenderText {TEXT} at (0,0) size 0x0
+      RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
 selection is CARET:
-start:      position 0 of child 1 {TEXT} of child 2 {SPAN} of root {DIV}
-upstream:   position 0 of child 1 {TEXT} of root {DIV}
-downstream: position 0 of child 2 {IMG} of child 2 {SPAN} of root {DIV}
+start:      position 0 of  of root {DIV}
+upstream:   position 0 of  of root {DIV}
+downstream: position 0 of  of root {DIV}
diff --git a/LayoutTests/editing/selection/extend-by-character-006-expected.txt b/LayoutTests/editing/selection/extend-by-character-006-expected.txt
index 91b3721..371238b 100644
--- a/LayoutTests/editing/selection/extend-by-character-006-expected.txt
+++ b/LayoutTests/editing/selection/extend-by-character-006-expected.txt
@@ -10,7 +10,10 @@ layer at (0,0) size 800x600
         RenderText {TEXT} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
         RenderText {TEXT} at (0,0) size 0x0
-selection is CARET:
+selection is RANGE:
 start:      position 0 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
 upstream:   position 0 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
 downstream: position 1 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
+end:        position 4 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
+upstream:   position 4 of child 1 {TEXT} of child 1 {SPAN} of root {DIV}
+downstream: position 1 of child 5 {TEXT} of root {DIV}
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d2ad4ae..cbe69ca 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-07-09  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by me
+        
+        Updated some layout test results.
+
+        * layout-tests/editing/deleting/delete-image-004-expected.txt:
+        * layout-tests/editing/selection/extend-by-character-006-expected.txt:
+
 2004-07-09  Chris Blumenberg  <cblu at apple.com>
 
 	Allowed my change for 3715785 to compile on Jaguar.

-- 
WebKit Debian packaging