[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit c6f0901d89490e4d3dacddf867bbaf51bbe33a4c
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 11 20:14:10 2010 +0000

    Updated Windows expected results after r53085.
    
    Reviewed by NOBODY.
    
    * platform/win/editing/selection/mixed-editability-10-expected.txt:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53092 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b1558ce..5590941 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-11  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by NOBODY.
+        
+        Updated Windows expected results after r53085.
+
+        * platform/win/editing/selection/mixed-editability-10-expected.txt:
+
 2010-01-11  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Adam Roben & Dirk Schulze.
diff --git a/LayoutTests/platform/win/editing/selection/mixed-editability-10-expected.txt b/LayoutTests/platform/win/editing/selection/mixed-editability-10-expected.txt
index 075ca7e..e1cd981 100644
--- a/LayoutTests/platform/win/editing/selection/mixed-editability-10-expected.txt
+++ b/LayoutTests/platform/win/editing/selection/mixed-editability-10-expected.txt
@@ -12,6 +12,9 @@ Hello
 Hello World
 #5 DIV element empty
 
+#6 non editable DIV element with an editable empty span element
+
+Hello: 
 Anchor ([object HTMLDivElement], 0 caret[0,0] refpos=40) is incorrect.
 Anchor ([object HTMLDivElement], 3 caret[0,0] refpos=75) is incorrect.
 Anchor ([object HTMLDivElement], 1 caret[0,0] refpos=43) is incorrect.
@@ -19,3 +22,4 @@ Anchor ([object HTMLDivElement], 0 caret[0,0] refpos=8) is incorrect.
 Anchor ([object HTMLDivElement], 0 caret[0,0] refpos=73) is incorrect.
 Anchor ([object HTMLDivElement], 3 caret[0,0] refpos=47) is incorrect.
 Anchor ([object HTMLDivElement], 0 caret[0,0] refpos=58) is incorrect.
+Anchor ([object HTMLElement], 0 caret[0,0] refpos=0) is correct.

-- 
WebKit Debian packaging