[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ojan at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 2a15dc7a04c4bf1ab2f7e3f1aa9a77a4ac5fb0a8
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 21:00:36 2010 +0000

    2010-07-29  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Tor Arne Vestbø.
    
            fix for editing/style/remove-underline-from-stylesheet.html on qt after r64303
            https://bugs.webkit.org/show_bug.cgi?id=43208
    
            * platform/qt/editing/style/remove-underline-from-stylesheet-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64305 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c44f18a..fa31126 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-29  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        fix for editing/style/remove-underline-from-stylesheet.html on qt after r64303
+        https://bugs.webkit.org/show_bug.cgi?id=43208
+
+        * platform/qt/editing/style/remove-underline-from-stylesheet-expected.txt:
+
 2010-07-29  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/LayoutTests/platform/qt/editing/style/remove-underline-from-stylesheet-expected.txt b/LayoutTests/platform/qt/editing/style/remove-underline-from-stylesheet-expected.txt
index 5acc401..19ffe0e 100644
--- a/LayoutTests/platform/qt/editing/style/remove-underline-from-stylesheet-expected.txt
+++ b/LayoutTests/platform/qt/editing/style/remove-underline-from-stylesheet-expected.txt
@@ -70,11 +70,8 @@ EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
 This tests removing underline from stylesheet (.editing has underline). Because text-decoration that comes from a style rule cannot be pushed down, the underline should stay. (see bug 27809).
-
-<DIV class="editing" id="root" contentEditable="">
-<#text>xxxxxx </#text>
-<#text><selection-anchor>xxxxxx<selection-focus></#text>
-<#text> xxxxxx</#text>
-<SPAN id="test">
-</SPAN>
-</DIV>
+| "xxxxxx "
+| "<#selection-anchor>xxxxxx<#selection-focus>"
+| " xxxxxx"
+| <span>
+|   id="test"

-- 
WebKit Debian packaging