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

[ossy at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 4756ae4cf89fa4d2e987d11e284de00924deedee
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 16 14:21:58 2009 +0000

    Rubber-stamped by Kenneth Rohde Christiansen.
    
    https://bugs.webkit.org/show_bug.cgi?id=31332
    
    [Qt] After http://trac.webkit.org/changeset/52192
    there are a failing and a timeouter test.
    
    * platform/qt/Skipped: http/tests/misc/drag-over-iframe-invalid-source-crash.html added until fix.
    * platform/qt/fast/text/international/khmer-selection-expected.txt: update outdated expected.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52197 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 17fda4b..188c5aa 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,17 @@
 2009-12-16  Csaba Osztrogonác  <ossy at webkit.org>
 
+        Rubber-stamped by Kenneth Rohde Christiansen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31332
+
+        [Qt] After http://trac.webkit.org/changeset/52192
+        there are a failing and a timeouter test.
+
+        * platform/qt/Skipped: http/tests/misc/drag-over-iframe-invalid-source-crash.html added until fix.
+        * platform/qt/fast/text/international/khmer-selection-expected.txt: update outdated expected.
+
+2009-12-16  Csaba Osztrogonác  <ossy at webkit.org>
+
         Rubber-stamped by Simon Hausmann.
 
         [Qt] http://trac.webkit.org/changeset/52194 fixed a side-effect
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 7024e7a..36aa3c1 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -259,6 +259,8 @@ fast/events/drag-parent-node.html
 fast/events/drag-and-drop.html
 fast/events/drag-and-drop-dataTransfer-types-nocrash.html
 fast/events/drag-and-drop-fire-drag-dragover.html
+# caused by: http://trac.webkit.org/changeset/52192
+http/tests/misc/drag-over-iframe-invalid-source-crash.html
 
 # ------- broken backgroundOf(el)
 fast/forms/input-live-pseudo-selectors.html
diff --git a/LayoutTests/platform/qt/fast/text/international/khmer-selection-expected.txt b/LayoutTests/platform/qt/fast/text/international/khmer-selection-expected.txt
index 5b6942b..54e6265 100644
--- a/LayoutTests/platform/qt/fast/text/international/khmer-selection-expected.txt
+++ b/LayoutTests/platform/qt/fast/text/international/khmer-selection-expected.txt
@@ -44,4 +44,5 @@ layer at (0,0) size 800x129
             text run at (124,43) width 56: "test_shell"
         RenderText {#text} at (180,40) size 289x20
           text run at (180,40) width 289: " shouldn't trigger any assertions or crash."
-caret: position 0 of child 0 {#text} of child 0 {B} of child 1 {NOBR} of child 1 {P} of child 1 {BODY} of child 1 {HTML} of document
+selection start: position 0 of child 0 {#text} of child 0 {B} of child 1 {NOBR} of child 1 {P} of child 1 {BODY} of child 1 {HTML} of document
+selection end:   position 7 of child 0 {#text} of child 6 {A} of child 1 {NOBR} of child 1 {P} of child 1 {BODY} of child 1 {HTML} of document

-- 
WebKit Debian packaging