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

[rniwa at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b374d1477c25eccc0ad19b626a3a046e8b486e16
Author: rniwa at webkit.org <rniwa at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 3 20:08:28 2010 +0000

    2010-09-03  Ryosuke Niwa  <rniwa at webkit.org>
    
            Reviewed by Tony Chang.
    
            Fixed a test committed in r66743.
    
            * editing/style/script-tests/push-down-implicit-styles-around-list.js:
            (selectLastWord):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66764 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 65c2aab..3b54a10 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-03  Ryosuke Niwa  <rniwa at webkit.org>
+
+        Reviewed by Tony Chang.
+
+        Fixed a test committed in r66743.
+
+        * editing/style/script-tests/push-down-implicit-styles-around-list.js:
+        (selectLastWord):
+
 2010-09-03  Dan Bernstein  <mitz at apple.com>
 
         Rubber-stamped by Anders Carlsson.
diff --git a/LayoutTests/editing/style/script-tests/push-down-implicit-styles-around-list.js b/LayoutTests/editing/style/script-tests/push-down-implicit-styles-around-list.js
index 475dc72..84d5eac 100644
--- a/LayoutTests/editing/style/script-tests/push-down-implicit-styles-around-list.js
+++ b/LayoutTests/editing/style/script-tests/push-down-implicit-styles-around-list.js
@@ -17,54 +17,36 @@ function testSingleToggle(toggleCommand, selector, initialContents, expectedCont
         testFailed(action + ", expected " + expectedContents);
 }
 
-function selectAll(container) {
-    window.getSelection().selectAllChildren(container);
-    return 'all';
-}
-
-function selectTest(container) {
-    window.getSelection().selectAllChildren(document.getElementById('test'));
-    return 'test';
-}
-
 function selectFirstWord(container) {
     window.getSelection().setPosition(container, 0);
     window.getSelection().modify('extend', 'forward', 'word');
     return 'first word';
 }
 
-function selectSecondWord(container) {
-    window.getSelection().setPosition(container, 0);
-    window.getSelection().modify('move', 'forward', 'word');
-    window.getSelection().modify('extend', 'forward', 'word');
-    return 'second word';
-}
-
-function selectLastTwoWords(container) {
+function selectLastWord(container) {
     window.getSelection().setPosition(container, container.childNodes.length);
     window.getSelection().modify('extend', 'backward', 'word');
-    window.getSelection().modify('extend', 'backward', 'word');
-    return 'last two words';
+    return 'last word';
 }
 
 testSingleToggle("bold", selectFirstWord, '<b><ul><li><b>a</b></li></ul></b>', '<ul><li>a</li></ul>');
 testSingleToggle("bold", selectFirstWord, '<b><ul><li>hello</li><li>world</li></ul></b>', '<ul><li>hello</li><li style="font-weight: bold; ">world</li></ul>');
-testSingleToggle("bold", selectSecondWord, '<ul><li>hello</li><li style="font-weight: bold; ">world</li></ul>', '<ul><li>hello</li><li>world</li></ul>');
+testSingleToggle("bold", selectLastWord, '<ul><li>hello</li><li style="font-weight: bold; ">world</li></ul>', '<ul><li>hello</li><li>world</li></ul>');
 testSingleToggle("bold", selectFirstWord, '<b><ul><li>hello world</li><li>webkit</li></ul></b>', '<ul><li>hello<b> world</b></li><li style="font-weight: bold; ">webkit</li></ul>');
 
 testSingleToggle("italic", selectFirstWord, '<i><ul><li><i>a</i></li></ul></i>', '<ul><li>a</li></ul>');
 testSingleToggle("italic", selectFirstWord, '<i><ul><li>hello</li><li>world</li></ul></i>', '<ul><li>hello</li><li style="font-style: italic; ">world</li></ul>');
-testSingleToggle("italic", selectSecondWord, '<ul><li>hello</li><li style="font-style: italic; ">world</li></ul>', '<ul><li>hello</li><li>world</li></ul>');
+testSingleToggle("italic", selectLastWord, '<ul><li>hello</li><li style="font-style: italic; ">world</li></ul>', '<ul><li>hello</li><li>world</li></ul>');
 testSingleToggle("italic", selectFirstWord, '<i><ul><li>hello world</li><li>webkit</li></ul></i>', '<ul><li>hello<i> world</i></li><li style="font-style: italic; ">webkit</li></ul>');
 
 testSingleToggle("underline", selectFirstWord, '<u><ul><li><u>a</u></li></ul></u>', '<ul><li>a</li></ul>');
 testSingleToggle("underline", selectFirstWord, '<u><ul><li>hello</li><li>world</li></ul></u>', '<ul><li>hello</li><li style="text-decoration: underline; ">world</li></ul>');
-testSingleToggle("underline", selectSecondWord, '<ul><li>hello</li><li style="text-decoration: underline; ">world</li></ul>', '<ul><li>hello</li><li>world</li></ul>');
+testSingleToggle("underline", selectLastWord, '<ul><li>hello</li><li style="text-decoration: underline; ">world</li></ul>', '<ul><li>hello</li><li>world</li></ul>');
 testSingleToggle("underline", selectFirstWord, '<u><ul><li>hello world</li><li>webkit</li></ul></u>', '<ul><li>hello<u> world</u></li><li style="text-decoration: underline; ">webkit</li></ul>');
 
 testSingleToggle("strikethrough", selectFirstWord, '<s><ul><li><s>a</s></li></ul></s>', '<ul><li>a</li></ul>');
 testSingleToggle("strikethrough", selectFirstWord, '<s><ul><li>hello</li><li>world</li></ul></s>', '<ul><li>hello</li><li style="text-decoration: line-through; ">world</li></ul>');
-testSingleToggle("strikethrough", selectSecondWord, '<ul><li>hello</li><li style="text-decoration: line-through; ">world</li></ul>', '<ul><li>hello</li><li>world</li></ul>');
+testSingleToggle("strikethrough", selectLastWord, '<ul><li>hello</li><li style="text-decoration: line-through; ">world</li></ul>', '<ul><li>hello</li><li>world</li></ul>');
 testSingleToggle("strikethrough", selectFirstWord, '<s><ul><li>hello world</li><li>webkit</li></ul></s>', '<ul><li>hello<s> world</s></li><li style="text-decoration: line-through; ">webkit</li></ul>');
 
 document.body.removeChild(testContainer);

-- 
WebKit Debian packaging