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

Thu Feb 4 21:28:29 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit e25b3543eb4711bde05f2fd7f2b984a3cf2508d1
Author: enrica at apple.com <enrica at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 01:00:08 2010 +0000

    Fixing for failing test on qt.
    https://bugs.webkit.org/show_bug.cgi?id=34148
    
    Reviewed by Jon Honeycutt.
    
    Changed url in anchor tag to avoid the additional trailing slash.
    
    * editing/pasteboard/paste-noscript-xhtml-expected.txt:
    * editing/resources/htmlcontent.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53873 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 44347ff..9c0cb8f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-26  Enrica Casucci  <enrica at apple.com>
+
+        Reviewed by Jon Honeycutt.
+
+        Fixing for failing test on qt.
+        https://bugs.webkit.org/show_bug.cgi?id=34148
+        
+        Changed url in anchor tag to avoid the additional trailing slash.
+
+        * editing/pasteboard/paste-noscript-xhtml-expected.txt:
+        * editing/resources/htmlcontent.html:
+
 2010-01-26  Dmitry Titov  <dimich at chromium.org>
 
         Reviewed by David Levin.
diff --git a/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt b/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt
index 97afa8b..d8faedd 100644
--- a/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt
+++ b/LayoutTests/editing/pasteboard/paste-noscript-xhtml-expected.txt
@@ -4,4 +4,4 @@ This test copies the content of an iframe and pastes it in an editable area in a
 
 HelloCNNHello
 This is a form
-<button xmlns="http://www.w3.org/1999/xhtml" id="button1" style="width: 100px; ">Hello</button><a xmlns="http://www.w3.org/1999/xhtml" id="anchor1" href="http://www.cnn.com/">CNN</a><a xmlns="http://www.w3.org/1999/xhtml" id="anchor2">Hello</a><iframe xmlns="http://www.w3.org/1999/xhtml" id="iframe1" style="width: 200px; height: 100px; background-color: rgb(204, 238, 238); "></iframe><form xmlns="http://www.w3.org/1999/xhtml" id="form1" style="width: 200px; height: 150px; background-color: rgb(204, 238, 238); ">This is a form</form>
+<button xmlns="http://www.w3.org/1999/xhtml" id="button1" style="width: 100px; ">Hello</button><a xmlns="http://www.w3.org/1999/xhtml" id="anchor1" href="http://www.bing.com/search?q=cnn">CNN</a><a xmlns="http://www.w3.org/1999/xhtml" id="anchor2">Hello</a><iframe xmlns="http://www.w3.org/1999/xhtml" id="iframe1" style="width: 200px; height: 100px; background-color: rgb(204, 238, 238); "></iframe><form xmlns="http://www.w3.org/1999/xhtml" id="form1" style="width: 200px; height: 150px; background-color: rgb(204, 238, 238); ">This is a form</form>
diff --git a/LayoutTests/editing/resources/htmlcontent.html b/LayoutTests/editing/resources/htmlcontent.html
index c7e385c..5ed1aed 100644
--- a/LayoutTests/editing/resources/htmlcontent.html
+++ b/LayoutTests/editing/resources/htmlcontent.html
@@ -7,7 +7,7 @@ if (window.layoutTestController)
      layoutTestController.dumpAsText();
 </script>
 <body>
-<button id="button1" onclick="sayHello()" ondblclick="sayHello()" style="width: 100px;">Hello</button><a id="anchor1" href="http://www.cnn.com">CNN</a><a id="anchor2" href="javascript:sayHello()">Hello</a>
+<button id="button1" onclick="sayHello()" ondblclick="sayHello()" style="width: 100px;">Hello</button><a id="anchor1" href="http://www.bing.com/search?q=cnn">CNN</a><a id="anchor2" href="javascript:sayHello()">Hello</a>
 <script style="display: block; position: fixed; top: 4000px">alert('hello');</script>
 <script src="../editing.js" style="display: block; position: fixed; top: 4000px"></script>
 <iframe id="iframe1" src="javascript:sayHello()" style="width: 200px; height: 100px; background-color:#cee;"></iframe>

-- 
WebKit Debian packaging

