Changeset 86619 in webkit


Ignore:
Timestamp:
May 16, 2011 3:46:28 PM (13 years ago)
Author:
rniwa@webkit.org
Message:

2011-05-16 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Enrica Casucci.

editing/pasteboard/5075944-2.html and 5075944-3.html should be renamed and converted to dump-as-markup tests
​https://bugs.webkit.org/show_bug.cgi?id=60923

Renamed pasteboard/5075944-2.html to pasteboard/preserve-underline-color.html and pasteboard/5075944-3.html to
deleting/deleting-line-break-preserves-underline-color.html. Also converted them to dump-as-markup tests.

  • editing/deleting/deleting-line-break-preserves-underline-color-expected.txt: Added.
  • editing/deleting/deleting-line-break-preserves-underline-color.html: Copied from LayoutTests/editing/pasteboard/5075944-3.html.
  • editing/pasteboard/5075944-2.html: Removed.
  • editing/pasteboard/5075944-3.html: Removed.
  • editing/pasteboard/preserve-underline-color-expected.txt: Added.
  • editing/pasteboard/preserve-underline-color.html: Copied from LayoutTests/editing/pasteboard/5075944-2.html.
  • platform/chromium-linux/editing/pasteboard/5075944-2-expected.png: Removed.
  • platform/chromium-linux/editing/pasteboard/5075944-3-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/5075944-2-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/5075944-2-expected.txt: Removed.
  • platform/chromium-win/editing/pasteboard/5075944-3-expected.png: Removed.
  • platform/chromium-win/editing/pasteboard/5075944-3-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/5075944-2-expected.png: Removed.
  • platform/gtk/editing/pasteboard/5075944-2-expected.txt: Removed.
  • platform/gtk/editing/pasteboard/5075944-3-expected.txt: Removed.
  • platform/mac-leopard/editing/pasteboard/5075944-2-expected.png: Removed.
  • platform/mac-leopard/editing/pasteboard/5075944-3-expected.png: Removed.
  • platform/mac/editing/pasteboard/5075944-2-expected.png: Removed.
  • platform/mac/editing/pasteboard/5075944-2-expected.txt: Removed.
  • platform/mac/editing/pasteboard/5075944-3-expected.png: Removed.
  • platform/mac/editing/pasteboard/5075944-3-expected.txt: Removed.
  • platform/qt-arm/Skipped:
  • platform/qt-mac/Skipped:
  • platform/qt/editing/pasteboard/5075944-2-expected.txt: Removed.
  • platform/qt/editing/pasteboard/5075944-3-expected.txt: Removed.
Location:
trunk/LayoutTests
Files:
2 added
17 deleted
3 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r86618 r86619  
     12011-05-16  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Enrica Casucci.
     4
     5        editing/pasteboard/5075944-2.html and 5075944-3.html should be renamed and converted to dump-as-markup tests
     6        https://bugs.webkit.org/show_bug.cgi?id=60923
     7
     8        Renamed pasteboard/5075944-2.html to pasteboard/preserve-underline-color.html and pasteboard/5075944-3.html to
     9        deleting/deleting-line-break-preserves-underline-color.html. Also converted them to dump-as-markup tests.
     10
     11        * editing/deleting/deleting-line-break-preserves-underline-color-expected.txt: Added.
     12        * editing/deleting/deleting-line-break-preserves-underline-color.html: Copied from LayoutTests/editing/pasteboard/5075944-3.html.
     13        * editing/pasteboard/5075944-2.html: Removed.
     14        * editing/pasteboard/5075944-3.html: Removed.
     15        * editing/pasteboard/preserve-underline-color-expected.txt: Added.
     16        * editing/pasteboard/preserve-underline-color.html: Copied from LayoutTests/editing/pasteboard/5075944-2.html.
     17        * platform/chromium-linux/editing/pasteboard/5075944-2-expected.png: Removed.
     18        * platform/chromium-linux/editing/pasteboard/5075944-3-expected.png: Removed.
     19        * platform/chromium-win/editing/pasteboard/5075944-2-expected.png: Removed.
     20        * platform/chromium-win/editing/pasteboard/5075944-2-expected.txt: Removed.
     21        * platform/chromium-win/editing/pasteboard/5075944-3-expected.png: Removed.
     22        * platform/chromium-win/editing/pasteboard/5075944-3-expected.txt: Removed.
     23        * platform/gtk/editing/pasteboard/5075944-2-expected.png: Removed.
     24        * platform/gtk/editing/pasteboard/5075944-2-expected.txt: Removed.
     25        * platform/gtk/editing/pasteboard/5075944-3-expected.txt: Removed.
     26        * platform/mac-leopard/editing/pasteboard/5075944-2-expected.png: Removed.
     27        * platform/mac-leopard/editing/pasteboard/5075944-3-expected.png: Removed.
     28        * platform/mac/editing/pasteboard/5075944-2-expected.png: Removed.
     29        * platform/mac/editing/pasteboard/5075944-2-expected.txt: Removed.
     30        * platform/mac/editing/pasteboard/5075944-3-expected.png: Removed.
     31        * platform/mac/editing/pasteboard/5075944-3-expected.txt: Removed.
     32        * platform/qt-arm/Skipped:
     33        * platform/qt-mac/Skipped:
     34        * platform/qt/editing/pasteboard/5075944-2-expected.txt: Removed.
     35        * platform/qt/editing/pasteboard/5075944-3-expected.txt: Removed.
     36
    1372011-05-16  Adam Barth  <abarth@webkit.org>
    238

  • trunk/LayoutTests/editing/deleting/deleting-line-break-preserves-underline-color.html

    r86605 r86619  
    1 <p>This test for a bug moving a paragraph of underlined text.  The text should look the same before and after the deletion.</p>
     1<!DOCTYPE html>
     2<html>
     3<body>
    24<div id="div" contenteditable="true"><div>This should not be underlined.</div><span style="text-decoration: underline; color: blue;"><span style="color:red;">This should be underlined.</span></span></div>
     5<script src="../../resources/dump-as-markup.js"></script>
     6<script>
     7Markup.description("This test for a bug moving a paragraph of underlined text.  The text should look the same before and after the deletion.");
    38
    4 <script>
    59var div = document.getElementById("div");
    610var sel = window.getSelection();
     11
     12Markup.dump('div', 'Before');
    713
    814sel.setPosition(div, 0);
    … …  
    1016sel.modify("move", "forward", "character");
    1117document.execCommand("Delete");
     18
     19Markup.dump('div', 'After');
    1220</script>
     21</body>
     22</html>

  • trunk/LayoutTests/editing/pasteboard/preserve-underline-color.html

    r86605 r86619  
     1<!DOCTYPE html>
     2<html>
     3<body>
    14<p>This test for a bug copy/pasting underlined text.  The color of the underline should be the color of the element that has the text-decoration property.</p>
     5<p>To manually test, copy "This should be underlined" and paste it on the second editable region.</p>
    26<div id="copy" contenteditable="true"><span style="text-decoration: underline; color: blue;"><span style="color:red;">This should be underlined.</span></span></div>
    37<div id="paste" contenteditable="true"><br></div>
     8<script src="../../resources/dump-as-markup.js"></script>
     9<script>
    410
    5 <script>
    6 var copy = document.getElementById("copy");
    7 copy.focus();
    8 document.execCommand("SelectAll");
    9 document.execCommand("Copy");
    10 var paste = document.getElementById("paste");
    11 paste.focus();
    12 document.execCommand("Paste");
     11if (window.layoutTestController) {
     12    var copy = document.getElementById("copy");
     13    copy.focus();
     14    document.execCommand("SelectAll");
     15    document.execCommand("Copy");
     16    var paste = document.getElementById("paste");
     17    paste.focus();
     18    document.execCommand("Paste");
     19
     20    Markup.description(document.getElementsByTagName('p')[0].innerText);
     21    Markup.dump('paste');
     22} else
     23    Markup.noAutoDump();
     24
    1325</script>
     26</body>
     27</html>

  • trunk/LayoutTests/platform/qt-arm/Skipped

    r86605 r86619  
    841841editing/pasteboard/5071074-2.html
    842842editing/pasteboard/5071074.html
    843 editing/pasteboard/5075944-2.html
    844 editing/pasteboard/5075944-3.html
    845843editing/pasteboard/5075944.html
    846844editing/pasteboard/5089327.html

  • trunk/LayoutTests/platform/qt-mac/Skipped

    r86613 r86619  
    820820editing/pasteboard/5071074-2.html
    821821editing/pasteboard/5071074.html
    822 editing/pasteboard/5075944-2.html
    823 editing/pasteboard/5075944-3.html
    824822editing/pasteboard/5075944.html
    825823editing/pasteboard/5089327.html
Note: See TracChangeset for help on using the changeset viewer.