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

Thu Apr 8 00:44:00 UTC 2010

The following commit has been merged in the webkit-1.2 branch:
commit c1981b5596e901157ae41a85ef5fc025c93cf60a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 20 12:18:33 2009 +0000

    2009-12-20  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            * platform/gtk/editing/pasteboard/middle-button-paste-expected.txt:
            * platform/gtk/editing/pasteboard/middle-button-paste.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52413 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c456b44..aac8163 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-20  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * platform/gtk/editing/pasteboard/middle-button-paste-expected.txt:
+        * platform/gtk/editing/pasteboard/middle-button-paste.html:
+
 2009-12-20  Dirk Pranke  <dpranke at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste-expected.txt
index 657dde8..78b3234 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste-expected.txt
+++ b/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste-expected.txt
@@ -1,3 +1,3 @@
-Select me, selecSelect mt me, select me
+Select me, select me, selSelect me, sect me
 
 The original text was "Select me, select me, select me", after selecting and pasting the result should be "Select me, selecSelect mt me, select me"
diff --git a/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste.html b/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste.html
index 62e3b5c..a08a0f2 100644
--- a/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste.html
+++ b/LayoutTests/platform/gtk/editing/pasteboard/middle-button-paste.html
@@ -32,7 +32,7 @@ function runTest()
 </script>
 </head>
 <body onload="runTest()">
-<div id="text" contenteditable>Select me, select me, select me</div>
+<div style="font-size: 10px" id="text" contenteditable>Select me, select me, select me</div>
 
 <br/>
 <p>The original text was "Select me, select me, select me", after selecting and pasting the result should be "Select me, selecSelect mt me, select me"</p>

-- 
WebKit Debian packaging

