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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 270695c41e63120a0b51431e987d0c8d624eea5e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 5 22:46:56 2009 +0000

    2009-11-05  Shu Chang  <Chang.Shu at nokia.com>
    
            Reviewed by Adele Peterson.
    
            The number of selected lines in textarea after a shift-PageDown
            may differ. The test case is modified so that it will not depend
            on the exact number of lines selected. This should resolve regression
            on platforms like Qt and GTK.
            https://bugs.webkit.org/show_bug.cgi?id=31122
    
            * editing/selection/shrink-selection-after-shift-pagedown.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50579 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index e00c007..8cc7e24 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-05  Shu Chang  <Chang.Shu at nokia.com>
+
+        Reviewed by Adele Peterson.
+
+        The number of selected lines in textarea after a shift-PageDown
+        may differ. The test case is modified so that it will not depend
+        on the exact number of lines selected. This should resolve regression
+        on platforms like Qt and GTK.
+        https://bugs.webkit.org/show_bug.cgi?id=31122
+
+        * editing/selection/shrink-selection-after-shift-pagedown.html:
+
 2009-11-05  Pavel Feldman  <pfeldman at chromium.org>
 
         Not reviewed: empty line in expectations build fix.
diff --git a/LayoutTests/editing/selection/shrink-selection-after-shift-pagedown.html b/LayoutTests/editing/selection/shrink-selection-after-shift-pagedown.html
index 956d717..4c828f3 100644
--- a/LayoutTests/editing/selection/shrink-selection-after-shift-pagedown.html
+++ b/LayoutTests/editing/selection/shrink-selection-after-shift-pagedown.html
@@ -7,16 +7,18 @@
             layoutTestController.dumpAsText();
         
         var ta = document.getElementById('ta');
-        ta.setSelectionRange(3, 14);
-        
+        ta.setSelectionRange(4, 16);
+
+        var lastSelectedLine;
         if (window.eventSender) {
             eventSender.keyDown("pageDown",["shiftKey"]);
+            lastSelectedLine = (ta.value).substring(ta.selectionEnd - 4, ta.selectionEnd);
             eventSender.keyDown("upArrow",["shiftKey"]);
         }
         
         var result;
         var selectedText = (ta.value).substring(ta.selectionStart, ta.selectionEnd);
-        if (selectedText.indexOf('NO') == -1)
+        if ((selectedText.indexOf(lastSelectedLine) == -1) && (selectedText.indexOf('L01') == -1))
             result = "SUCCESS: The selection shrunk correctly";
         else
             result = "SUCCESS: The selected text is \"" + selectedText + "\".";
@@ -33,23 +35,22 @@
     The selection should only include the lines with "YES".
 </p>
 <textarea rows=10 id="ta">
-NO
-YES
-YES
-YES
-YES
-YES
-YES
-YES
-YES
-YES
-NO
-NO
-NO
-NO
-NO
-NO
-NO
+L01
+L02
+L03
+L04
+L05
+L06
+L07
+L08
+L09
+L10
+L11
+L12
+L13
+L14
+L15
+L16
 </textarea>
 <p id="result">TEST HAS NOT RUN</p>
 </body>

-- 
WebKit Debian packaging