Changeset 147896 in webkit


Ignore:
Timestamp:
Apr 7, 2013 11:53:14 PM (11 years ago)
Author:
benjamin@webkit.org
Message:

Regression(r147893) Caused several editing tests to fail
https://bugs.webkit.org/show_bug.cgi?id=114143

Patch by Christophe Dumez <Christophe Dumez> on 2013-04-07
Reviewed by Benjamin Poulain.

r147893 removed some Android code from WebCore but failed to update the
layout tests accordingly. This patch remove Android-specific tests from
several editing layout tests.

  • editing/deleting/paragraph-in-preserveNewline-expected.txt:
  • editing/deleting/paragraph-in-preserveNewline.html:
  • editing/deleting/whitespace-pre-1-expected.txt:
  • editing/deleting/whitespace-pre-1.html:
  • editing/execCommand/script-tests/toggle-compound-styles.js:
  • editing/execCommand/toggle-compound-styles-expected.txt:
  • editing/selection/5354455-1-expected.txt:
  • editing/selection/5354455-1.html:
  • editing/selection/click-in-margins-inside-editable-div-expected.txt:
  • editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt:
  • editing/selection/extend-after-mouse-selection-expected.txt:
  • editing/selection/extend-after-mouse-selection.html:
  • editing/selection/programmatic-selection-on-mac-is-directionless-expected.txt:
  • editing/selection/programmatic-selection-on-mac-is-directionless.html:
  • editing/selection/script-tests/click-in-margins-inside-editable-div.js:
  • editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js:
  • editing/selection/selection-extend-should-not-move-across-caret-on-mac-expected.txt:
  • editing/selection/selection-extend-should-not-move-across-caret-on-mac.html:
Location:
trunk/LayoutTests
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r147891 r147896  
     12013-04-07  Christophe Dumez  <ch.dumez@sisa.samsung.com>
     2
     3        Regression(r147893) Caused several editing tests to fail
     4        https://bugs.webkit.org/show_bug.cgi?id=114143
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        r147893 removed some Android code from WebCore but failed to update the
     9        layout tests accordingly. This patch remove Android-specific tests from
     10        several editing layout tests.
     11
     12        * editing/deleting/paragraph-in-preserveNewline-expected.txt:
     13        * editing/deleting/paragraph-in-preserveNewline.html:
     14        * editing/deleting/whitespace-pre-1-expected.txt:
     15        * editing/deleting/whitespace-pre-1.html:
     16        * editing/execCommand/script-tests/toggle-compound-styles.js:
     17        * editing/execCommand/toggle-compound-styles-expected.txt:
     18        * editing/selection/5354455-1-expected.txt:
     19        * editing/selection/5354455-1.html:
     20        * editing/selection/click-in-margins-inside-editable-div-expected.txt:
     21        * editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt:
     22        * editing/selection/extend-after-mouse-selection-expected.txt:
     23        * editing/selection/extend-after-mouse-selection.html:
     24        * editing/selection/programmatic-selection-on-mac-is-directionless-expected.txt:
     25        * editing/selection/programmatic-selection-on-mac-is-directionless.html:
     26        * editing/selection/script-tests/click-in-margins-inside-editable-div.js:
     27        * editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js:
     28        * editing/selection/selection-extend-should-not-move-across-caret-on-mac-expected.txt:
     29        * editing/selection/selection-extend-should-not-move-across-caret-on-mac.html:
     30
    1312013-04-07  Benjamin Poulain  <benjamin@webkit.org>
    232
  • trunk/LayoutTests/editing/deleting/paragraph-in-preserveNewline-expected.txt

    r141837 r147896  
    88EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    99EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of PRE > DIV > BODY > HTML > #document to 0 of PRE > DIV > BODY > HTML > #document toDOMRange:range from 0 of PRE > DIV > BODY > HTML > #document to 0 of PRE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
    10 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    11 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    12 EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of PRE > DIV > BODY > HTML > #document to 0 of PRE > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > PRE > DIV > BODY > HTML > #document to 3 of #text > PRE > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
    13 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    14 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    15 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    16 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    17 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    18 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    19 EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > PRE > DIV > BODY > HTML > #document to 3 of #text > PRE > DIV > BODY > HTML > #document
    20 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    2110EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    2211EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
     
    8372|   "<#selection-anchor>foo<#selection-focus>
    8473bar"
    85 
    86 on android:
    87 | <pre>
    88 |   "<#selection-caret>
    89 bar"
    90 
    91 after undo on android:
    92 | <pre>
    93 |   "<#selection-anchor>foo<#selection-focus>
    94 bar"
  • trunk/LayoutTests/editing/deleting/paragraph-in-preserveNewline.html

    r141837 r147896  
    3232runTestsOn("win");
    3333runTestsOn("unix");
    34 runTestsOn("android");
    3534</script>
    3635</body>
  • trunk/LayoutTests/editing/deleting/whitespace-pre-1-expected.txt

    r141837 r147896  
    66EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    77EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
    8 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    9 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    10 EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 69 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
    11 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    12 EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    13 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    14 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    15 EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 69 of #text > DIV > BODY > HTML > #document
    16 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    178EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    189EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
     
    7566There should be three paragraphs in this editable region.
    7667The first one should be empty."
    77 
    78 on android:
    79 | "<#selection-caret>
    80 There should be three paragraphs in this editable region.
    81 The first one should be empty."
    82 
    83 after undo on android:
    84 | "<#selection-anchor>You should not see this paragraph unless the command has been undone.<#selection-focus>
    85 There should be three paragraphs in this editable region.
    86 The first one should be empty."
  • trunk/LayoutTests/editing/deleting/whitespace-pre-1.html

    r141837 r147896  
    2929runTestsOn("win");
    3030runTestsOn("unix");
    31 runTestsOn("android");
    3231</script>
  • trunk/LayoutTests/editing/execCommand/script-tests/toggle-compound-styles.js

    r141837 r147896  
    1717}
    1818
    19 platforms = ['mac', 'win', 'unix', 'android'];
     19platforms = ['mac', 'win', 'unix'];
    2020
    2121for (var i = 0; i < platforms.length; i++) {
  • trunk/LayoutTests/editing/execCommand/toggle-compound-styles-expected.txt

    r141837 r147896  
    4646PASS one italic command converted "<s><b>hello<i> world</i></b></s>" to "<s><b><i>hello world</i></b></s>
    4747
    48 Platform: android
    49 PASS one bold command converted "<u><b>hello</b> world</u>" to "<u><b>hello world</b></u>
    50 PASS one bold command converted "<b>hello </b>world" to "<b>hello world</b>
    51 PASS one bold command converted "<u><b>hello </b></u>world" to "<b><u>hello </u>world</b>
    52 PASS one italic command converted "<i>hello</i> <img>" to "<i>hello <img></i>
    53 PASS one bold command converted "<u><span id='test'><b>hello</b></span><b>world</b></u>" to "<u><span id="test">hello</span>world</u>
    54 PASS one bold command converted "<span id='test' style='font-weight:normal;'><b>hello</b></span>" to "<span id="test">hello</span>
    55 PASS one bold command converted "<div><b>hello</b><br><br><b>world</b></div>" to "<div>hello<br><br>world</div>
    56 PASS one italic command converted "<i>hello </i><img>" to "hello <img>
    57 PASS one italic command converted "<i><b>hello</b>world</i>" to "<b>hello</b>world
    58 PASS one italic command converted "<span style='font-style: normal;'> <i> hello </i> </span>" to "  hello 
    59 PASS one italic command converted "<p><i>hello</i><span style='font-style:italic;'>world</span></p>" to "<p>helloworld</p>
    60 PASS one italic command converted "<s><b>hello<i> world</i></b></s>" to "<s><b><i>hello world</i></b></s>
    61 
    6248PASS successfullyParsed is true
    6349
  • trunk/LayoutTests/editing/selection/5354455-1-expected.txt

    r141837 r147896  
    88
    99Unix: Caret
    10 
    11 Android: Caret
  • trunk/LayoutTests/editing/selection/5354455-1.html

    r141837 r147896  
    77<p>Win: <span id="resultwin">RUNNING</span></p>
    88<p>Unix: <span id="resultunix">RUNNING</span></p>
    9 <p>Android: <span id="resultandroid">RUNNING</span></p>
    109
    1110<script>
     
    3534    test('win', 'resultwin');
    3635    test('unix', 'resultunix');
    37     test('android', 'resultandroid');
    3836}
    3937</script>
  • trunk/LayoutTests/editing/selection/click-in-margins-inside-editable-div-expected.txt

    r141837 r147896  
    3232PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 1 focusNode: [object Text](YY) focusOffset: 1 isCollapsed: true]
    3333PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
    34 PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
    35 PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 1 focusNode: [object Text](XX) focusOffset: 1 isCollapsed: true]
    36 PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
    37 PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
    38 PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
    39 PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
    40 PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 1 focusNode: [object Text](XX) focusOffset: 1 isCollapsed: true]
    41 PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
    42 PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
    43 PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 1 focusNode: [object Text](YY) focusOffset: 1 isCollapsed: true]
    44 PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
    45 PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
    46 PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 1 focusNode: [object Text](YY) focusOffset: 1 isCollapsed: true]
    47 PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
    4834PASS successfullyParsed is true
    4935
  • trunk/LayoutTests/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt

    r141837 r147896  
    88PASS Selection is [anchorNode: [object Text](FOO) anchorOffset: 1 focusNode: [object Text](FOO) focusOffset: 1 isCollapsed: true]
    99PASS Selection is [anchorNode: [object Text](FOO) anchorOffset: 1 focusNode: [object Text](FOO) focusOffset: 1 isCollapsed: true]
    10 PASS Selection is [anchorNode: [object Text](FOO) anchorOffset: 1 focusNode: [object Text](FOO) focusOffset: 1 isCollapsed: true]
    11 PASS Selection is [anchorNode: [object Text](FOO) anchorOffset: 1 focusNode: [object Text](FOO) focusOffset: 1 isCollapsed: true]
    1210PASS successfullyParsed is true
    1311
  • trunk/LayoutTests/editing/selection/extend-after-mouse-selection-expected.txt

    r141837 r147896  
    1717PASS Selection is [anchorNode: [object Text](bc) anchorOffset: 0 focusNode: [object Text]( ) focusOffset: 1 isCollapsed: false]
    1818PASS Selection is [anchorNode: [object Text](bc) anchorOffset: 0 focusNode: [object HTMLSpanElement](null) focusOffset: 4 isCollapsed: false]
    19 PASS Selection is [anchorNode: [object Text](bc) anchorOffset: 0 focusNode: [object Text](ef) focusOffset: 2 isCollapsed: false]
    20 PASS Selection is [anchorNode: [object Text](bc) anchorOffset: 0 focusNode: [object Text](ef) focusOffset: 1 isCollapsed: false]
    21 PASS Selection is [anchorNode: [object Text](bc) anchorOffset: 0 focusNode: [object Text](ef) focusOffset: 2 isCollapsed: false]
    22 PASS Selection is [anchorNode: [object Text](bc) anchorOffset: 0 focusNode: [object Text]( ) focusOffset: 1 isCollapsed: false]
    23 PASS Selection is [anchorNode: [object Text](bc) anchorOffset: 0 focusNode: [object HTMLSpanElement](null) focusOffset: 4 isCollapsed: false]
    2419PASS successfullyParsed is true
    2520
  • trunk/LayoutTests/editing/selection/extend-after-mouse-selection.html

    r141837 r147896  
    7878editingTest("win");
    7979editingTest("unix");
    80 editingTest("android");
    8180</script>
    8281<script src="../../fast/js/resources/js-test-post.js"></script>
  • trunk/LayoutTests/editing/selection/programmatic-selection-on-mac-is-directionless-expected.txt

    r141837 r147896  
    295295PASS right by line in text-input, after undoing bold
    296296PASS right by line in text-input, after undoing insertText
    297 android:
    298 PASS left by character in regular-div
    299 PASS left by character in regular-div, after undoing delete
    300 PASS left by character in regular-div, after undoing forwardDelete
    301 PASS left by character in regular-div, after undoing cut
    302 PASS left by character in regular-div, after undoing bold
    303 PASS left by character in regular-div, after undoing insertText
    304 PASS right by character in regular-div
    305 PASS right by character in regular-div, after undoing delete
    306 PASS right by character in regular-div, after undoing forwardDelete
    307 PASS right by character in regular-div, after undoing cut
    308 PASS right by character in regular-div, after undoing bold
    309 PASS right by character in regular-div, after undoing insertText
    310 PASS left by line in regular-div
    311 PASS left by line in regular-div, after undoing delete
    312 PASS left by line in regular-div, after undoing forwardDelete
    313 PASS left by line in regular-div, after undoing cut
    314 PASS left by line in regular-div, after undoing bold
    315 PASS left by line in regular-div, after undoing insertText
    316 PASS right by line in regular-div
    317 PASS right by line in regular-div, after undoing delete
    318 PASS right by line in regular-div, after undoing forwardDelete
    319 PASS right by line in regular-div, after undoing cut
    320 PASS right by line in regular-div, after undoing bold
    321 PASS right by line in regular-div, after undoing insertText
    322 PASS left by character in editable-div
    323 PASS left by character in editable-div, after undoing delete
    324 PASS left by character in editable-div, after undoing forwardDelete
    325 PASS left by character in editable-div, after undoing cut
    326 PASS left by character in editable-div, after undoing bold
    327 PASS left by character in editable-div, after undoing insertText
    328 PASS right by character in editable-div
    329 PASS right by character in editable-div, after undoing delete
    330 PASS right by character in editable-div, after undoing forwardDelete
    331 PASS right by character in editable-div, after undoing cut
    332 PASS right by character in editable-div, after undoing bold
    333 PASS right by character in editable-div, after undoing insertText
    334 PASS left by line in editable-div
    335 PASS left by line in editable-div, after undoing delete
    336 PASS left by line in editable-div, after undoing forwardDelete
    337 PASS left by line in editable-div, after undoing cut
    338 PASS left by line in editable-div, after undoing bold
    339 PASS left by line in editable-div, after undoing insertText
    340 PASS right by line in editable-div
    341 PASS right by line in editable-div, after undoing delete
    342 PASS right by line in editable-div, after undoing forwardDelete
    343 PASS right by line in editable-div, after undoing cut
    344 PASS right by line in editable-div, after undoing bold
    345 PASS right by line in editable-div, after undoing insertText
    346 PASS left by character in text-area
    347 PASS left by character in text-area, after undoing delete
    348 PASS left by character in text-area, after undoing forwardDelete
    349 PASS left by character in text-area, after undoing cut
    350 PASS left by character in text-area, after undoing bold
    351 PASS left by character in text-area, after undoing insertText
    352 PASS right by character in text-area
    353 PASS right by character in text-area, after undoing delete
    354 PASS right by character in text-area, after undoing forwardDelete
    355 PASS right by character in text-area, after undoing cut
    356 PASS right by character in text-area, after undoing bold
    357 PASS right by character in text-area, after undoing insertText
    358 PASS left by line in text-area
    359 PASS left by line in text-area, after undoing delete
    360 PASS left by line in text-area, after undoing forwardDelete
    361 PASS left by line in text-area, after undoing cut
    362 PASS left by line in text-area, after undoing bold
    363 PASS left by line in text-area, after undoing insertText
    364 PASS right by line in text-area
    365 PASS right by line in text-area, after undoing delete
    366 PASS right by line in text-area, after undoing forwardDelete
    367 PASS right by line in text-area, after undoing cut
    368 PASS right by line in text-area, after undoing bold
    369 PASS right by line in text-area, after undoing insertText
    370 PASS left by character in text-input
    371 PASS left by character in text-input, after undoing delete
    372 PASS left by character in text-input, after undoing forwardDelete
    373 PASS left by character in text-input, after undoing cut
    374 PASS left by character in text-input, after undoing bold
    375 PASS left by character in text-input, after undoing insertText
    376 PASS right by character in text-input
    377 PASS right by character in text-input, after undoing delete
    378 PASS right by character in text-input, after undoing forwardDelete
    379 PASS right by character in text-input, after undoing cut
    380 PASS right by character in text-input, after undoing bold
    381 PASS right by character in text-input, after undoing insertText
    382 PASS left by line in text-input
    383 PASS left by line in text-input, after undoing delete
    384 PASS left by line in text-input, after undoing forwardDelete
    385 PASS left by line in text-input, after undoing cut
    386 PASS left by line in text-input, after undoing bold
    387 PASS left by line in text-input, after undoing insertText
    388 PASS right by line in text-input
    389 PASS right by line in text-input, after undoing delete
    390 PASS right by line in text-input, after undoing forwardDelete
    391 PASS right by line in text-input, after undoing cut
    392 PASS right by line in text-input, after undoing bold
    393 PASS right by line in text-input, after undoing insertText
    394297PASS successfullyParsed is true
    395298
  • trunk/LayoutTests/editing/selection/programmatic-selection-on-mac-is-directionless.html

    r141837 r147896  
    136136    runTestsFor('win');
    137137    runTestsFor('unix');
    138     runTestsFor('android');
    139138
    140139    document.getElementById('test').innerHTML = '';
  • trunk/LayoutTests/editing/selection/script-tests/click-in-margins-inside-editable-div.js

    r141837 r147896  
    9696editingTest("mac");
    9797editingTest("win");
    98 editingTest("android");
    9998
    10099// Clean up after ourselves if we're not being run in the browser
  • trunk/LayoutTests/editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js

    r141837 r147896  
    7070editingTest("mac");
    7171editingTest("win");
    72 editingTest("android");
    7372
    7473// Clean up after ourselves if we're not being run in the browser
  • trunk/LayoutTests/editing/selection/selection-extend-should-not-move-across-caret-on-mac-expected.txt

    r141837 r147896  
    2222Extend backward and then forward by paragraph: PASS
    2323Extend forward and then backward by paragraph: PASS
    24 android:
    25 Extend backward and then forward by word: PASS
    26 Extend forward and then backward by word: PASS
    27 Extend backward and then forward by line: PASS
    28 Extend forward and then backward by line: PASS
    29 Extend backward and then forward by paragraph: PASS
    30 Extend forward and then backward by paragraph: PASS
    3124
  • trunk/LayoutTests/editing/selection/selection-extend-should-not-move-across-caret-on-mac.html

    r141837 r147896  
    6060editingTest("win");
    6161editingTest("unix");
    62 editingTest("android");
    6362
    6463var node = document.getElementById("test-div");
Note: See TracChangeset for help on using the changeset viewer.