Skip to content

GitLab

Commit 8d2e1c50 authored by rniwa@webkit.org's avatar rniwa@webkit.org
Browse files

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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@83268 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 4072bea9
Hide whitespace changes
Inline Side-by-side
LayoutTests/ChangeLog
View file @ 8d2e1c50
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.
2011-04-08 Csaba Osztrogonác <ossy@webkit.org>
 
[Qt] Add platform specific expected file after r83235.
LayoutTests/editing/pasteboard/5065605-expected.txt 0 → 100644
View file @ 8d2e1c50
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 24 of #text > DIV > BODY > HTML > #document to 24 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 24 of #text > DIV > BODY > HTML > #document to 24 of #text > DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 24 of #text > DIV > DIV > BODY > HTML > #document to 24 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 24 of #text > DIV > DIV > BODY > HTML > #document to 24 of #text > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 24 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > FONT > DIV > BODY > HTML > #document to 24 of #text > FONT > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 24 of #text > FONT > DIV > DIV > BODY > HTML > #document to 24 of #text > FONT > DIV > DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 24 of #text > FONT > DIV > DIV > DIV > BODY > HTML > #document to 24 of #text > FONT > DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
This tests for a bug where text copied with Select All + Copy would lose its color.
| <font>
| class="Apple-style-span"
| color="#ff0000"
| "This text should be red."
| <div>
| <font>
| class="Apple-style-span"
| color="#ff0000"
| "This text should be red."
| <div>
| <font>
| class="Apple-style-span"
| color="#ff0000"
| "This text should be red."
| <div>
| <font>
| class="Apple-style-span"
| color="#ff0000"
| "This text should be red.<#selection-caret>"
LayoutTests/editing/pasteboard/5065605.html
View file @ 8d2e1c50
<p>This tests for a bug where text copied with Select All + Copy would lose its color.</p>
<!DOCTYPE html>
<html>
<body>
<div id="div" contenteditable="true"><br></div>
<script src="../../resources/dump-as-markup.js"></script>
<script>
var div = document.getElementById("div");
div.focus();
if (window.layoutTestController)
layoutTestController.dumpEditingCallbacks();
document.execCommand("InsertText", false, "This text should be red.");
document.execCommand("InsertParagraph");
document.execCommand("InsertText", false, "This text should be red.");
......@@ -14,4 +19,10 @@ document.execCommand("Copy");
window.getSelection().modify("move", "forward", "character");
document.execCommand("InsertParagraph");
document.execCommand("Paste");
Markup.description('This tests for a bug where text copied with Select All + Copy would lose its color.');
Markup.dump('div');
</script>
</body>
</html>
LayoutTests/editing/pasteboard/display-block-on-spans-expected.txt 0 → 100644
View file @ 8d2e1c50
This is a test case for the fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=7904.
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.
The following two results must be visually identical except for the caret.
before:
| "
"
| <span>
| style="display:block"
| <b>
| "<#selection-caret>This is a paragraph."
| "
"
| <span>
| style="display:block"
| <b>
| "This is another paragraph."
| "
"
after:
| "
"
| <span>
| style="display: block; "
| <b>
| "This is a paragraph."
| <span>
| style="display:block"
| <b>
| "This<#selection-caret>"
| <b>
| " is another paragraph."
| <br>
| "
"
LayoutTests/editing/pasteboard/display-block-on-spans.html
View file @ 8d2e1c50
<head>
<script src=../editing.js type="text/javascript"></script>
<script type="text/javascript">
function editingTest() {
extendSelectionForwardByLineCommand();
extendSelectionForwardByWordCommand();
copyCommand();
pasteCommand();
}
</script>
<title>Pasting spans with display:block</title>
</head>
<!DOCTYPE html>
<html>
<body>
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.
<hr>
<div contenteditable id="test">
<span style="display:block"><b>This is a paragraph.</b></span>
<span style="display:block"><b>This is another paragraph.</b></span>
</div>
<script src="../editing.js"></script>
<script src="../../resources/dump-as-markup.js"></script>
<script>
Markup.description('This is a test case for the fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=7904.\n'+
'ReplaceSelectionCommand used to guess whether or not nodes in the fragment to be pasted were blocks. It now knows for sure.\n'+
'Before the fix, ReplaceSelectionCommand blew away content of the div below after copy/pasting it over itself.\n'+
'The following two results must be visually identical except for the caret.');
<script>runEditingTest();</script>
var test = document.getElementById('test');
test.focus();
window.getSelection().setPosition(test, 0);
Markup.dump(test, 'before');
extendSelectionForwardByLineCommand();
extendSelectionForwardByWordCommand();
copyCommand();
pasteCommand();
Markup.dump(test, 'after');
</script>
</body>
</html>
LayoutTests/platform/chromium-linux/editing/pasteboard/5065605-expected.checksum deleted 100644 → 0
View file @ 4072bea9
2b32fd88ccf02a2e545bd8a99b4358d1
\ No newline at end of file
LayoutTests/platform/chromium-win/editing/pasteboard/5065605-expected.checksum deleted 100644 → 0
View file @ 4072bea9
2d5bdb79fc01ea35e1d71294d5bf98a0
\ No newline at end of file
LayoutTests/platform/chromium-win/editing/pasteboard/5065605-expected.txt deleted 100644 → 0
View file @ 4072bea9
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x20
RenderText {#text} at (0,0) size 493x19
text run at (0,0) width 493: "This tests for a bug where text copied with Select All + Copy would lose its color."
RenderBlock {DIV} at (0,36) size 784x80
RenderBlock (anonymous) at (0,0) size 784x20
RenderInline {FONT} at (0,0) size 141x19 [color=#FF0000]
RenderText {#text} at (0,0) size 141x19
text run at (0,0) width 141: "This text should be red."
RenderBlock {DIV} at (0,20) size 784x20
RenderInline {FONT} at (0,0) size 141x19 [color=#FF0000]
RenderText {#text} at (0,0) size 141x19
text run at (0,0) width 141: "This text should be red."
RenderBlock {DIV} at (0,40) size 784x40
RenderBlock (anonymous) at (0,0) size 784x20
RenderInline {FONT} at (0,0) size 141x19 [color=#FF0000]
RenderText {#text} at (0,0) size 141x19
text run at (0,0) width 141: "This text should be red."
RenderBlock {DIV} at (0,20) size 784x20
RenderInline {FONT} at (0,0) size 141x19 [color=#FF0000]
RenderText {#text} at (0,0) size 141x19
text run at (0,0) width 141: "This text should be red."
RenderBlock (anonymous) at (0,40) size 784x0
caret: position 24 of child 0 {#text} of child 0 {FONT} of child 1 {DIV} of child 2 {DIV} of child 2 {DIV} of body
LayoutTests/platform/chromium-win/editing/pasteboard/display-block-on-spans-expected.txt deleted 100644 → 0
View file @ 4072bea9
EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 5 of DIV > BODY > HTML > #document
EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of #text > B > SPAN > DIV > BODY > HTML > #document to 4 of #text > B > SPAN > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 4 of #text > B > SPAN > DIV > BODY > HTML > #document to 4 of #text > B > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock (anonymous) at (0,0) size 784x60
RenderText {#text} at (0,0) size 187x19
text run at (0,0) width 187: "This is a testcase for the fix for "
RenderInline {A} at (0,0) size 323x19 [color=#0000EE]
RenderText {#text} at (187,0) size 323x19
text run at (187,0) width 323: "http://bugzilla.opendarwin.org/show_bug.cgi?id=7904"
RenderText {#text} at (510,0) size 782x59
text run at (510,0) width 8: ". "
text run at (518,0) width 252: "ReplaceSelectionCommand used to guess"
text run at (0,20) width 385: "whether or not nodes in the fragment to be pasted were blocks. "
text run at (385,20) width 141: "It now knows for sure. "
text run at (526,20) width 256: "Before the fix, ReplaceSelectionCommand"
text run at (0,40) width 402: "blew away content of the div below after copy/pasting it over itself."
RenderBlock {HR} at (0,68) size 784x2 [border: (1px inset #000000)]
RenderBlock {DIV} at (0,78) size 784x40
RenderBlock {SPAN} at (0,0) size 784x20
RenderInline {B} at (0,0) size 132x19
RenderText {#text} at (0,0) size 132x19
text run at (0,0) width 132: "This is a paragraph."
RenderBlock {SPAN} at (0,20) size 784x20
RenderInline {B} at (0,0) size 29x19
RenderText {#text} at (0,0) size 29x19
text run at (0,0) width 29: "This"
RenderInline {B} at (0,0) size 146x19
RenderText {#text} at (29,0) size 146x19
text run at (29,0) width 146: " is another paragraph."
caret: position 4 of child 0 {#text} of child 0 {B} of child 2 {SPAN} of child 5 {DIV} of body
LayoutTests/platform/gtk/editing/pasteboard/5065605-expected.checksum deleted 100644 → 0
View file @ 4072bea9
d7e62c6bac4eba04016ef0968f75c465
\ No newline at end of file
LayoutTests/platform/gtk/editing/pasteboard/5065605-expected.txt deleted 100644 → 0
View file @ 4072bea9
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderBlock {P} at (0,0) size 784x19
RenderText {#text} at (0,0) size 517x19
text run at (0,0) width 517: "This tests for a bug where text copied with Select All + Copy would lose its color."
RenderBlock {DIV} at (0,35) size 784x76
RenderBlock (anonymous) at (0,0) size 784x19
RenderInline {FONT} at (0,0) size 148x19 [color=#FF0000]
RenderText {#text} at (0,0) size 148x19
text run at (0,0) width 148: "This text should be red."
RenderBlock {DIV} at (0,19) size 784x19
RenderInline {FONT} at (0,0) size 148x19 [color=#FF0000]
RenderText {#text} at (0,0) size 148x19
text run at (0,0) width 148: "This text should be red."
RenderBlock {DIV} at (0,38) size 784x38
RenderBlock (anonymous) at (0,0) size 784x19
RenderInline {FONT} at (0,0) size 148x19 [color=#FF0000]
RenderText {#text} at (0,0) size 148x19
text run at (0,0) width 148: "This text should be red."
RenderBlock {DIV} at (0,19) size 784x19
RenderInline {FONT} at (0,0) size 148x19 [color=#FF0000]
RenderText {#text} at (0,0) size 148x19
text run at (0,0) width 148: "This text should be red."
RenderBlock (anonymous) at (0,38) size 784x0
caret: position 24 of child 0 {#text} of child 0 {FONT} of child 1 {DIV} of child 2 {DIV} of child 2 {DIV} of body
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment