Changeset 83268 in webkit


Ignore:
Timestamp:
Apr 8, 2011 12:53:11 AM (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/5065605.html and display-block-on-spans.html
​https://bugs.webkit.org/show_bug.cgi?id=58074

Converted 5065605.html and display-block-on-spans.html to dump-as-markup tests.

  • editing/pasteboard/5065605-expected.txt: Added.
  • editing/pasteboard/5065605.html:
  • editing/pasteboard/display-block-on-spans-expected.txt: Added.
  • editing/pasteboard/display-block-on-spans.html:
  • platform/chromium-linux/editing/pasteboard/5065605-expected.checksum: Removed.
  • platform/chromium-linux/editing/pasteboard/5065605-expected.png: Removed.
  • platform/chromium-linux/editing/pasteboard/display-block-on-spans-expected.checksum: Removed.
  • platform/chromium-linux/editing/pasteboard/display-block-on-spans-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/5065605-expected.checksum: Removed.
  • platform/chromium-win/editing/pasteboard/5065605-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/5065605-expected.txt: Removed.
  • platform/chromium-win/editing/pasteboard/display-block-on-spans-expected.checksum: Removed.
  • platform/chromium-win/editing/pasteboard/display-block-on-spans-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/display-block-on-spans-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/5065605-expected.checksum: Removed.
  • platform/gtk/editing/pasteboard/5065605-expected.png: Removed.
  • platform/gtk/editing/pasteboard/5065605-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/display-block-on-spans-expected.checksum: Removed.
  • platform/gtk/editing/pasteboard/display-block-on-spans-expected.png: Removed.
  • platform/gtk/editing/pasteboard/display-block-on-spans-expected.txt: Removed.
  • platform/mac-leopard/editing/pasteboard/5065605-expected.checksum: Removed.
  • platform/mac-leopard/editing/pasteboard/5065605-expected.png: Removed.
  • platform/mac-leopard/editing/pasteboard/display-block-on-spans-expected.checksum: Removed.
  • platform/mac-leopard/editing/pasteboard/display-block-on-spans-expected.png: Removed.
  • platform/mac/editing/pasteboard/5065605-expected.checksum: Removed.
  • platform/mac/editing/pasteboard/5065605-expected.png: Removed.
  • platform/mac/editing/pasteboard/5065605-expected.txt: Removed.
  • platform/mac/editing/pasteboard/display-block-on-spans-expected.checksum: Removed.
  • platform/mac/editing/pasteboard/display-block-on-spans-expected.png: Removed.
  • platform/mac/editing/pasteboard/display-block-on-spans-expected.txt: Removed.
  • platform/qt/editing/pasteboard/5065605-expected.txt: Removed.
  • platform/qt/editing/pasteboard/display-block-on-spans-expected.txt: Removed.
Location:
trunk/LayoutTests
Files:
2 added
28 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r83267 r83268  
     12011-04-08  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Tony Chang.
     4
     5        dump-as-markup conversion: editing/pasteboard/5065605.html and display-block-on-spans.html
     6        https://bugs.webkit.org/show_bug.cgi?id=58074
     7
     8        Converted 5065605.html and display-block-on-spans.html to dump-as-markup tests.
     9
     10        * editing/pasteboard/5065605-expected.txt: Added.
     11        * editing/pasteboard/5065605.html:
     12        * editing/pasteboard/display-block-on-spans-expected.txt: Added.
     13        * editing/pasteboard/display-block-on-spans.html:
     14        * platform/chromium-linux/editing/pasteboard/5065605-expected.checksum: Removed.
     15        * platform/chromium-linux/editing/pasteboard/5065605-expected.png: Removed.
     16        * platform/chromium-linux/editing/pasteboard/display-block-on-spans-expected.checksum: Removed.
     17        * platform/chromium-linux/editing/pasteboard/display-block-on-spans-expected.png: Removed.
     18        * platform/chromium-win/editing/pasteboard/5065605-expected.checksum: Removed.
     19        * platform/chromium-win/editing/pasteboard/5065605-expected.png: Removed.
     20        * platform/chromium-win/editing/pasteboard/5065605-expected.txt: Removed.
     21        * platform/chromium-win/editing/pasteboard/display-block-on-spans-expected.checksum: Removed.
     22        * platform/chromium-win/editing/pasteboard/display-block-on-spans-expected.png: Removed.
     23        * platform/chromium-win/editing/pasteboard/display-block-on-spans-expected.txt: Removed.
     24        * platform/gtk/editing/pasteboard/5065605-expected.checksum: Removed.
     25        * platform/gtk/editing/pasteboard/5065605-expected.png: Removed.
     26        * platform/gtk/editing/pasteboard/5065605-expected.txt: Removed.
     27        * platform/gtk/editing/pasteboard/display-block-on-spans-expected.checksum: Removed.
     28        * platform/gtk/editing/pasteboard/display-block-on-spans-expected.png: Removed.
     29        * platform/gtk/editing/pasteboard/display-block-on-spans-expected.txt: Removed.
     30        * platform/mac-leopard/editing/pasteboard/5065605-expected.checksum: Removed.
     31        * platform/mac-leopard/editing/pasteboard/5065605-expected.png: Removed.
     32        * platform/mac-leopard/editing/pasteboard/display-block-on-spans-expected.checksum: Removed.
     33        * platform/mac-leopard/editing/pasteboard/display-block-on-spans-expected.png: Removed.
     34        * platform/mac/editing/pasteboard/5065605-expected.checksum: Removed.
     35        * platform/mac/editing/pasteboard/5065605-expected.png: Removed.
     36        * platform/mac/editing/pasteboard/5065605-expected.txt: Removed.
     37        * platform/mac/editing/pasteboard/display-block-on-spans-expected.checksum: Removed.
     38        * platform/mac/editing/pasteboard/display-block-on-spans-expected.png: Removed.
     39        * platform/mac/editing/pasteboard/display-block-on-spans-expected.txt: Removed.
     40        * platform/qt/editing/pasteboard/5065605-expected.txt: Removed.
     41        * platform/qt/editing/pasteboard/display-block-on-spans-expected.txt: Removed.
     42
    1432011-04-08  Csaba Osztrogonác  <ossy@webkit.org>
    244

  • trunk/LayoutTests/editing/pasteboard/5065605.html

    r20520 r83268  
    1 <p>This tests for a bug where text copied with Select All + Copy would lose its color.</p>
     1<!DOCTYPE html>
     2<html>
     3<body>
    24<div id="div" contenteditable="true"><br></div>
    3 
     5<script src="../../resources/dump-as-markup.js"></script>
    46<script>
    57var div = document.getElementById("div");
    68div.focus();
     9
     10if (window.layoutTestController)
     11    layoutTestController.dumpEditingCallbacks();
    712
    813document.execCommand("InsertText", false, "This text should be red.");
    … …  
    1520document.execCommand("InsertParagraph");
    1621document.execCommand("Paste");
     22
     23Markup.description('This tests for a bug where text copied with Select All + Copy would lose its color.');
     24Markup.dump('div');
     25
    1726</script>
     27</body>
     28</html>

  • trunk/LayoutTests/editing/pasteboard/display-block-on-spans.html

    r48921 r83268  
    1 <head>
    2 <script src=../editing.js  type="text/javascript"></script>
    3 <script type="text/javascript">
    4 function editingTest() {
    5     extendSelectionForwardByLineCommand();
    6     extendSelectionForwardByWordCommand();
    7     copyCommand();
    8     pasteCommand();
    9 }
    10 </script>
    11 <title>Pasting spans with display:block</title>
    12 </head>
     1<!DOCTYPE html>
     2<html>
    133<body>
    14 
    15 This is a testcase for the fix for <a href="https://bugs.webkit.org/show_bug.cgi?id=7904">http://bugzilla.opendarwin.org/show_bug.cgi?id=7904</a>.  ReplaceSelectionCommand used to guess whether or not nodes in the fragment to be pasted were blocks.  It now knows for sure.  Before the fix, ReplaceSelectionCommand blew away content of the div below after copy/pasting it over itself.
    16 
    17 <hr>
    18 
    194<div contenteditable id="test">
    205<span style="display:block"><b>This is a paragraph.</b></span>
    216<span style="display:block"><b>This is another paragraph.</b></span>
    227</div>
     8<script src="../editing.js"></script>
     9<script src="../../resources/dump-as-markup.js"></script>
     10<script>
    2311
    24 <script>runEditingTest();</script>
     12Markup.description('This is a test case for the fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=7904.\n'+
     13'ReplaceSelectionCommand used to guess whether or not nodes in the fragment to be pasted were blocks. It now knows for sure.\n'+
     14'Before the fix, ReplaceSelectionCommand blew away content of the div below after copy/pasting it over itself.\n'+
     15'The following two results must be visually identical except for the caret.');
    2516
     17var test = document.getElementById('test');
     18test.focus();
     19window.getSelection().setPosition(test, 0);
     20
     21Markup.dump(test, 'before');
     22
     23extendSelectionForwardByLineCommand();
     24extendSelectionForwardByWordCommand();
     25copyCommand();
     26pasteCommand();
     27
     28Markup.dump(test, 'after');
     29
     30</script>
    2631</body>
    2732</html>
Note: See TracChangeset for help on using the changeset viewer.