[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

Thu Feb 4 21:24:59 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit 664efe13d946e202c1c98f79a3a93a40a5737d85
Author: enrica at apple.com <enrica at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 19:13:10 2010 +0000

    Fix for the failing test on qt buildbot.
    This tests had been added as part of the patch for https://bugs.webkit.org/show_bug.cgi?id=33970
    
    Reviewed by Adele Peterson.
    
    * editing/pasteboard/paste-noscript-svg-expected.txt:
    * editing/resources/svgcontent.xhtml:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53707 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 19ef369..04b8dee 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-22  Enrica Casucci  <enrica at apple.com>
+
+        Reviewed by Adele Peterson.
+
+        Fix for the failing test on qt buildbot.
+        This tests had been added as part of the patch for https://bugs.webkit.org/show_bug.cgi?id=33970
+
+        * editing/pasteboard/paste-noscript-svg-expected.txt:
+        * editing/resources/svgcontent.xhtml:
+
 2010-01-22  Adam Roben  <aroben at apple.com>
 
         Check in expected failure results for text-zoom.xhtml on Windows
diff --git a/LayoutTests/editing/pasteboard/paste-noscript-svg-expected.txt b/LayoutTests/editing/pasteboard/paste-noscript-svg-expected.txt
index 6ab73c3..e86b54e 100644
--- a/LayoutTests/editing/pasteboard/paste-noscript-svg-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-noscript-svg-expected.txt
@@ -1,6 +1,5 @@
 This test copies the content of an iframe and pastes it in an editable area and verifies that no script, handlers or javascript urls are copied.
 
-Hello 
- 
+Hello
 world
-<div id="div1">Hello&nbsp;</div><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="5cm" height="3cm" viewbox="0 0 5 3" version="1.1"><a xlink:href=""><ellipse cx="2.5" cy="1.5" rx="2" ry="1" fill="red"></ellipse></a></svg>&nbsp;<div id="div2">world</div>
+<div id="div1">Hello</div><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="5cm" height="3cm" viewbox="0 0 5 3" version="1.1"><a xlink:href=""><ellipse cx="2.5" cy="1.5" rx="2" ry="1" fill="red"></ellipse></a></svg><div id="div2">world</div>
diff --git a/LayoutTests/editing/resources/svgcontent.xhtml b/LayoutTests/editing/resources/svgcontent.xhtml
index 22ee410..209b0a8 100644
--- a/LayoutTests/editing/resources/svgcontent.xhtml
+++ b/LayoutTests/editing/resources/svgcontent.xhtml
@@ -1,14 +1,9 @@
 <?xml version="1.0" standalone="no"?>
 <body>
-<div id="div1">
-Hello
-</div>
-<svg width="5cm" height="3cm" viewBox="0 0 5 3" version="1.1"
-     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<div id="div1">Hello</div><svg width="5cm" height="3cm" viewBox="0 0 5 3" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <a xlink:href="javascript:alert('hello Enrica')">
     <ellipse cx="2.5" cy="1.5" rx="2" ry="1"
              fill="red" />
   </a>
-</svg>
-<div id="div2">world</div>
+</svg><div id="div2">world</div>
 </body>

-- 
WebKit Debian packaging

