Changeset 83343 in webkit


Ignore:
Timestamp:
Apr 8, 2011 2:06:26 PM (13 years ago)
Author:
rniwa@webkit.org
Message:

2011-04-08 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Tony Chang.

dump-as-markup conversion: editing/pasteboard/paste-text-at-tabspan-001.html and paste-text-at-tabspan-002.html
https://bugs.webkit.org/show_bug.cgi?id=58081

Converted paste-text-at-tabspan-001.html and paste-text-at-tabspan-002.html to dump-as-markup tests.
Also explained what to expect in each test.

  • editing/pasteboard/paste-text-at-tabspan-001-expected.txt: Added.
  • editing/pasteboard/paste-text-at-tabspan-001.html:
  • editing/pasteboard/paste-text-at-tabspan-002-expected.txt: Added.
  • editing/pasteboard/paste-text-at-tabspan-002.html:
  • platform/chromium-linux/editing/pasteboard/paste-text-at-tabspan-001-expected.checksum: Removed.
  • platform/chromium-linux/editing/pasteboard/paste-text-at-tabspan-001-expected.png: Removed.
  • platform/chromium-linux/editing/pasteboard/paste-text-at-tabspan-002-expected.checksum: Removed.
  • platform/chromium-linux/editing/pasteboard/paste-text-at-tabspan-002-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-at-tabspan-001-expected.checksum: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-at-tabspan-001-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-at-tabspan-001-expected.txt: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-at-tabspan-002-expected.checksum: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-at-tabspan-002-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/paste-text-at-tabspan-002-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/paste-text-at-tabspan-001-expected.checksum: Removed.
  • platform/gtk/editing/pasteboard/paste-text-at-tabspan-001-expected.png: Removed.
  • platform/gtk/editing/pasteboard/paste-text-at-tabspan-001-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/paste-text-at-tabspan-002-expected.checksum: Removed.
  • platform/gtk/editing/pasteboard/paste-text-at-tabspan-002-expected.png: Removed.
  • platform/gtk/editing/pasteboard/paste-text-at-tabspan-002-expected.txt: Removed.
  • platform/mac/editing/pasteboard/paste-text-at-tabspan-001-expected.checksum: Removed.
  • platform/mac/editing/pasteboard/paste-text-at-tabspan-001-expected.png: Removed.
  • platform/mac/editing/pasteboard/paste-text-at-tabspan-001-expected.txt: Removed.
  • platform/mac/editing/pasteboard/paste-text-at-tabspan-002-expected.checksum: Removed.
  • platform/mac/editing/pasteboard/paste-text-at-tabspan-002-expected.png: Removed.
  • platform/mac/editing/pasteboard/paste-text-at-tabspan-002-expected.txt: Removed.
  • platform/qt/editing/pasteboard/paste-text-at-tabspan-001-expected.txt: Removed.
  • platform/qt/editing/pasteboard/paste-text-at-tabspan-002-expected.checksum: Removed.
  • platform/qt/editing/pasteboard/paste-text-at-tabspan-002-expected.png: Removed.
  • platform/qt/editing/pasteboard/paste-text-at-tabspan-002-expected.txt: Removed.
Location:
trunk/LayoutTests
Files:
24 deleted
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r83336 r83343  
     12011-04-08  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Tony Chang.
     4
     5        dump-as-markup conversion: editing/pasteboard/paste-text-at-tabspan-001.html and paste-text-at-tabspan-002.html
     6        https://bugs.webkit.org/show_bug.cgi?id=58081
     7
     8        Converted paste-text-at-tabspan-001.html and paste-text-at-tabspan-002.html to dump-as-markup tests.
     9        Also explained what to expect in each test.
     10
     11        * editing/pasteboard/paste-text-at-tabspan-001-expected.txt: Added.
     12        * editing/pasteboard/paste-text-at-tabspan-001.html:
     13        * editing/pasteboard/paste-text-at-tabspan-002-expected.txt: Added.
     14        * editing/pasteboard/paste-text-at-tabspan-002.html:
     15        * platform/chromium-linux/editing/pasteboard/paste-text-at-tabspan-001-expected.checksum: Removed.
     16        * platform/chromium-linux/editing/pasteboard/paste-text-at-tabspan-001-expected.png: Removed.
     17        * platform/chromium-linux/editing/pasteboard/paste-text-at-tabspan-002-expected.checksum: Removed.
     18        * platform/chromium-linux/editing/pasteboard/paste-text-at-tabspan-002-expected.png: Removed.
     19        * platform/chromium-win/editing/pasteboard/paste-text-at-tabspan-001-expected.checksum: Removed.
     20        * platform/chromium-win/editing/pasteboard/paste-text-at-tabspan-001-expected.png: Removed.
     21        * platform/chromium-win/editing/pasteboard/paste-text-at-tabspan-001-expected.txt: Removed.
     22        * platform/chromium-win/editing/pasteboard/paste-text-at-tabspan-002-expected.checksum: Removed.
     23        * platform/chromium-win/editing/pasteboard/paste-text-at-tabspan-002-expected.png: Removed.
     24        * platform/chromium-win/editing/pasteboard/paste-text-at-tabspan-002-expected.txt: Removed.
     25        * platform/gtk/editing/pasteboard/paste-text-at-tabspan-001-expected.checksum: Removed.
     26        * platform/gtk/editing/pasteboard/paste-text-at-tabspan-001-expected.png: Removed.
     27        * platform/gtk/editing/pasteboard/paste-text-at-tabspan-001-expected.txt: Removed.
     28        * platform/gtk/editing/pasteboard/paste-text-at-tabspan-002-expected.checksum: Removed.
     29        * platform/gtk/editing/pasteboard/paste-text-at-tabspan-002-expected.png: Removed.
     30        * platform/gtk/editing/pasteboard/paste-text-at-tabspan-002-expected.txt: Removed.
     31        * platform/mac/editing/pasteboard/paste-text-at-tabspan-001-expected.checksum: Removed.
     32        * platform/mac/editing/pasteboard/paste-text-at-tabspan-001-expected.png: Removed.
     33        * platform/mac/editing/pasteboard/paste-text-at-tabspan-001-expected.txt: Removed.
     34        * platform/mac/editing/pasteboard/paste-text-at-tabspan-002-expected.checksum: Removed.
     35        * platform/mac/editing/pasteboard/paste-text-at-tabspan-002-expected.png: Removed.
     36        * platform/mac/editing/pasteboard/paste-text-at-tabspan-002-expected.txt: Removed.
     37        * platform/qt/editing/pasteboard/paste-text-at-tabspan-001-expected.txt: Removed.
     38        * platform/qt/editing/pasteboard/paste-text-at-tabspan-002-expected.checksum: Removed.
     39        * platform/qt/editing/pasteboard/paste-text-at-tabspan-002-expected.png: Removed.
     40        * platform/qt/editing/pasteboard/paste-text-at-tabspan-002-expected.txt: Removed.
     41
    1422011-04-08  Ryosuke Niwa  <rniwa@webkit.org>
    243
  • trunk/LayoutTests/editing/pasteboard/paste-text-at-tabspan-001-expected.txt

    r83342 r83343  
    1 EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
    2 EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
    3 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    41EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    52EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
     
    129EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    1310EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    14 layer at (0,0) size 800x600
    15   RenderView at (0,0) size 800x600
    16 layer at (0,0) size 800x600
    17   RenderBlock {HTML} at (0,0) size 800x600
    18     RenderBody {BODY} at (8,8) size 784x584
    19       RenderBlock {DIV} at (0,0) size 784x56 [border: (2px solid #FF0000)]
    20         RenderInline {SPAN} at (0,0) size 155x28
    21           RenderText {#text} at (14,14) size 11x28
    22             text run at (14,14) width 11: "a"
    23           RenderText {#text} at (25,14) size 23x28
    24             text run at (25,14) width 23: "ax"
    25           RenderInline {SPAN} at (0,0) size 110x28
    26             RenderText {#text} at (48,14) size 110x28
    27               text run at (48,14) width 110: "\x{9}\x{9}\x{9}"
    28           RenderText {#text} at (158,14) size 11x28
    29             text run at (158,14) width 11: "z"
    30         RenderText {#text} at (0,0) size 0x0
    31 caret: position 2 of child 1 {#text} of child 1 {SPAN} of child 1 {DIV} of body
     11EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
     12EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
     13
     14You should see aax\tz below:
     15| "
     16"
     17| <span>
     18|   id="test"
     19|   "a"
     20|   "ax<#selection-caret>"
     21|   <span>
     22|     class="Apple-tab-span"
     23|     style="white-space:pre"
     24|     "                 "
     25|   "z"
     26| "
     27"
  • trunk/LayoutTests/editing/pasteboard/paste-text-at-tabspan-001.html

    r11995 r83343  
    1 <html>
    2 <head>
    3 
    4 <style>
    5 .editing {
    6     border: 2px solid red;
    7     padding: 12px;
    8     font-size: 24px;
    9 }
    10 </style>
    11 <script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
    12 
     1<!DOCTYPE html>
     2<html>
     3<body style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space; ">
     4<div contenteditable id="root" style="border: 2px solid red; padding: 12px; font-size: 24px">
     5<span id="test">a<span class="Apple-tab-span" style="white-space:pre">                  </span>z</span>
     6</div>
     7<script src="../editing.js"></script>
     8<script src="../../resources/dump-as-markup.js"></script>
    139<script>
    1410
    15 function editingTest() {
    16         extendSelectionForwardByCharacterCommand();
    17     copyCommand();
    18         moveSelectionForwardByCharacterCommand();
    19     pasteCommand();
    20     typeCharacterCommand();
    21 }
     11var test = document.getElementById('test');
     12test.focus();
     13window.getSelection().setPosition(test, 0);
     14
     15if (window.layoutTestController)
     16    layoutTestController.dumpEditingCallbacks();
     17
     18extendSelectionForwardByCharacterCommand();
     19copyCommand();
     20moveSelectionForwardByCharacterCommand();
     21pasteCommand();
     22typeCharacterCommand();
     23
     24Markup.dump('root', 'You should see aax\\tz below');
    2225
    2326</script>
    24 
    25 <title>Editing Test</title>
    26 </head>
    27 <body style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space; ">
    28 <div contenteditable id="root" class="editing">
    29 <span id="test">a<span class="Apple-tab-span" style="white-space:pre">                  </span>z</span>
    30 </div>
    31 
    32 <script>
    33 runEditingTest();
    34 </script>
    35 
    3627</body>
    3728</html>
  • trunk/LayoutTests/editing/pasteboard/paste-text-at-tabspan-002-expected.txt

    r83342 r83343  
    1 EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
    2 EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
    3 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    41EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    52EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
     
    1411EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
    1512EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
    16 layer at (0,0) size 800x600
    17   RenderView at (0,0) size 800x600
    18 layer at (0,0) size 800x600
    19   RenderBlock {HTML} at (0,0) size 800x600
    20     RenderBody {BODY} at (8,8) size 784x584
    21       RenderBlock {DIV} at (0,0) size 784x59 [border: (2px solid #FF0000)]
    22         RenderInline {SPAN} at (0,0) size 65x32
    23           RenderText {#text} at (14,14) size 12x32
    24             text run at (14,14) width 12: "a"
    25           RenderInline {SPAN} at (0,0) size 6x32
    26             RenderText {#text} at (26,14) size 6x32
    27               text run at (26,14) width 6: "\x{9}"
    28           RenderText {#text} at (32,14) size 24x32
    29             text run at (32,14) width 24: "ax"
    30           RenderInline {SPAN} at (0,0) size 12x32
    31             RenderText {#text} at (56,14) size 12x32
    32               text run at (56,14) width 12: "\x{9}\x{9}"
    33           RenderText {#text} at (68,14) size 11x32
    34             text run at (68,14) width 11: "z"
    35         RenderText {#text} at (0,0) size 0x0
    36 caret: position 2 of child 2 {#text} of child 1 {SPAN} of child 1 {DIV} of body
     13EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
     14EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
     15
     16You should see a\tax\t\tz below:
     17| "
     18"
     19| <span>
     20|   id="test"
     21 "a"
     22|   <span>
     23|     class="Apple-tab-span"
     24|     style="white-space:pre"
     25|     " "
     26|   "ax<#selection-caret>"
     27|   <span>
     28|     class="Apple-tab-span"
     29|     style="white-space:pre"
     30|     "         "
     31 "z"
     32| "
     33"
  • trunk/LayoutTests/editing/pasteboard/paste-text-at-tabspan-002.html

    r11995 r83343  
    1 <html>
    2 <head>
    3 
    4 <style>
    5 .editing {
    6     border: 2px solid red;
    7     padding: 12px;
    8     font-size: 24px;
    9 }
    10 </style>
    11 <script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
    12 
     1<!DOCTYPE html>
     2<html>
     3<body style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space; ">
     4<div contenteditable id="root" style="border: 2px solid red; padding: 12px; font-size: 24px">
     5<span id="test">a<span class="Apple-tab-span" style="white-space:pre">                  </span>z</span>
     6</div>
     7<script src="../editing.js"></script>
     8<script src="../../resources/dump-as-markup.js"></script>
    139<script>
    1410
    15 function editingTest() {
    16         extendSelectionForwardByCharacterCommand();
    17     copyCommand();
    18     for (i = 0; i < 2; i++)
    19                 moveSelectionForwardByCharacterCommand();
    20     pasteCommand();
    21     typeCharacterCommand();
    22 }
     11var test = document.getElementById('test');
     12test.focus();
     13window.getSelection().setPosition(test, 0);
     14
     15if (window.layoutTestController)
     16    layoutTestController.dumpEditingCallbacks();
     17
     18extendSelectionForwardByCharacterCommand();
     19copyCommand();
     20for (i = 0; i < 2; i++)
     21        moveSelectionForwardByCharacterCommand();
     22pasteCommand();
     23typeCharacterCommand();
     24
     25Markup.dump('root', 'You should see a\\tax\\t\\tz below');
    2326
    2427</script>
    25 
    26 <title>Editing Test</title>
    27 </head>
    28 <body style="word-wrap: break-word; -khtml-nbsp-mode: space; -khtml-line-break: after-white-space; ">
    29 <div contenteditable id="root" class="editing">
    30 <span id="test">a<span class="Apple-tab-span" style="white-space:pre">                  </span>z</span>
    31 </div>
    32 
    33 <script>
    34 runEditingTest();
    35 </script>
    36 
    3728</body>
    3829</html>
Note: See TracChangeset for help on using the changeset viewer.