Attachment #62489 for bug #42793

View Details Raw Unified Return to Bug 42793



2010-07-23  Ryosuke Niwa  <rniwa@webkit.org>

        Reviewed by NOBODY (OOPS!).

        editing/execCommand/hilitecolor.html and editing/style/remove-underline-from-stylesheet.html should be dumpAsMarkup tests
        https://bugs.webkit.org/show_bug.cgi?id=42793

        Converted the tests and removed the platform specific expected results.

        * editing/execCommand/hilitecolor-expected.txt: Added.
        * editing/execCommand/hilitecolor.html: Converted.
        * editing/style/remove-underline-from-stylesheet-expected.txt: Converted.
        * editing/style/remove-underline-from-stylesheet.html: Converted.
        * platform/chromium-linux/editing/execCommand/hilitecolor-expected.checksum: Removed.
        * platform/chromium-win/editing/execCommand/hilitecolor-expected.checksum: Removed.
        * platform/chromium-win/editing/execCommand/hilitecolor-expected.png: Removed.
        * platform/chromium-win/editing/execCommand/hilitecolor-expected.txt: Removed.
        * platform/mac/editing/execCommand/hilitecolor-expected.checksum: Removed.
        * platform/mac/editing/execCommand/hilitecolor-expected.png: Removed.
        * platform/mac/editing/execCommand/hilitecolor-expected.txt: Removed.
        * platform/qt/editing/execCommand/hilitecolor-expected.txt: Removed.

2010-07-23  James Robinson  <jamesr@chromium.org>

        Unreviewed.  Add chromium expectations for new tests.



EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification

<DIV id="test" contentEditable="true">
<#text><selection-caret>The </#text>
<SPAN style="background-color: red;" class="Apple-style-span">
<#text>second</#text>
</SPAN>
<#text> word, and only the second word of this sentence should have a red background color.</#text>
</DIV>



<script src="../../resources/dump-as-markup.js"></script>
<div id="test" contenteditable="true">The second word, and only the second word of this sentence should have a red background color.</div>
<script>
if (window.layoutTestController)
     layoutTestController.dumpEditingCallbacks();
</script>
<div id="test" contenteditable="true">The second word, and only the second word of this sentence should have a red background color.</div>

<script>
var sel = window.getSelection();
var e = document.getElementById("test");


sel.modify("extend", "backward", "word");
document.execCommand("HiliteColor", false, "red");
sel.modify("move", "backward", "line");

Markup.setNodeToDump('test')
</script>

Lines 68-74 EDITING DELEGATE: webViewDidChangeSelect LayoutTests/editing/style/remove-underline-from-stylesheet-expected.txt_sec1
- LayoutTests/editing/style/remove-underline-from-stylesheet-expected.txt -3 / +10 lines
68	EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE	68	EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
69	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification	69	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
70	EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification	70	EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
71	This tests removing underline from stylesheet. For consistency, underline should NOT be removed (see bug 27809).	71	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
		72	EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
		73	This tests removing underline from stylesheet (.editing has underline). Because text-decoration that comes from a style rule cannot be pushed down, the underline should stay. (see bug 27809).
72		74
73	xxxxxx xxxxxx xxxxxx	75	<DIV class="editing" id="root" contentEditable="">
74	xxxxxx xxxxxx xxxxxx<span id="test"></span>	76	<#text>xxxxxx </#text>
		77	<#text><selection-anchor>xxxxxx<selection-focus></#text>
		78	<#text> xxxxxx</#text>
		79	<SPAN id="test">
		80	</SPAN>
		81	</DIV>



<html> 
<head>

<style>
.editing { 
    border: 2px solid red; 

    text-decoration: underline;
}
</style>
<script src="../../resources/dump-as-markup.js"></script>
<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>

<script>

function editingTest() {

}

</script>
<title>Editing Test</title>
<title>Editing Test</title> 
</head> 
<body>
<p>This tests removing underline from stylesheet.  For consistency, underline should NOT be removed (see bug 27809).</p>
<div contenteditable id="root" class="editing">
<span id="test"></span>
</div>

<script>
Markup.description('This tests removing underline from stylesheet (.editing has underline). Because text-decoration that comes from a style rule cannot be pushed down, the underline should stay. (see bug 27809).');
Markup.setNodeToDump('root');
runEditingTest();
</script>

</body>
</html>

Line 1 LayoutTests/platform/chromium-linux/editing/execCommand/hilitecolor-expected.checksum_sec1
- LayoutTests/platform/chromium-linux/editing/execCommand/hilitecolor-expected.checksum -1 lines
1	377c5a99ece86782b750c7ea16f69ad3

Line 1 LayoutTests/platform/chromium-win/editing/execCommand/hilitecolor-expected.checksum_sec1
- LayoutTests/platform/chromium-win/editing/execCommand/hilitecolor-expected.checksum -1 lines
1	e9f172ce0e023db80546b0e0331213f9



EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
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 {DIV} at (0,0) size 784x20
        RenderText {#text} at (0,0) size 27x19
          text run at (0,0) width 27: "The "
        RenderInline {SPAN} at (0,0) size 43x19 [bgcolor=#FF0000]
          RenderText {#text} at (27,0) size 43x19
            text run at (27,0) width 43: "second"
        RenderText {#text} at (70,0) size 521x19
          text run at (70,0) width 521: " word, and only the second word of this sentence should have a red background color."
caret: position 0 of child 0 {#text} of child 0 {DIV} of body

Line 1 LayoutTests/platform/mac/editing/execCommand/hilitecolor-expected.checksum_sec1
- LayoutTests/platform/mac/editing/execCommand/hilitecolor-expected.checksum -1 lines
1	b1d045a2891f32c3be23051e231fcdc6



EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
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 {DIV} at (0,0) size 784x18
        RenderText {#text} at (0,0) size 29x18
          text run at (0,0) width 29: "The "
        RenderInline {SPAN} at (0,0) size 44x18 [bgcolor=#FF0000]
          RenderText {#text} at (29,0) size 44x18
            text run at (29,0) width 44: "second"
        RenderText {#text} at (73,0) size 543x18
          text run at (73,0) width 543: " word, and only the second word of this sentence should have a red background color."
caret: position 0 of child 0 {#text} of child 0 {DIV} of body



EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
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 {DIV} at (0,0) size 784x19
        RenderText {#text} at (0,0) size 29x19
          text run at (0,0) width 29: "The "
        RenderInline {SPAN} at (0,0) size 46x19 [bgcolor=#FF0000]
          RenderText {#text} at (29,0) size 46x19
            text run at (29,0) width 46: "second"
        RenderText {#text} at (75,0) size 546x19
          text run at (75,0) width 546: " word, and only the second word of this sentence should have a red background color."
caret: position 0 of child 0 {#text} of child 0 {DIV} of body

Return to Bug 42793

Lines 1-3 LayoutTests/ChangeLog_sec1
- LayoutTests/ChangeLog +22 lines
		1	2010-07-23 Ryosuke Niwa <rniwa@webkit.org>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	editing/execCommand/hilitecolor.html and editing/style/remove-underline-from-stylesheet.html should be dumpAsMarkup tests
		6	https://bugs.webkit.org/show_bug.cgi?id=42793
		7
		8	Converted the tests and removed the platform specific expected results.
		9
		10	* editing/execCommand/hilitecolor-expected.txt: Added.
		11	* editing/execCommand/hilitecolor.html: Converted.
		12	* editing/style/remove-underline-from-stylesheet-expected.txt: Converted.
		13	* editing/style/remove-underline-from-stylesheet.html: Converted.
		14	* platform/chromium-linux/editing/execCommand/hilitecolor-expected.checksum: Removed.
		15	* platform/chromium-win/editing/execCommand/hilitecolor-expected.checksum: Removed.
		16	* platform/chromium-win/editing/execCommand/hilitecolor-expected.png: Removed.
		17	* platform/chromium-win/editing/execCommand/hilitecolor-expected.txt: Removed.
		18	* platform/mac/editing/execCommand/hilitecolor-expected.checksum: Removed.
		19	* platform/mac/editing/execCommand/hilitecolor-expected.png: Removed.
		20	* platform/mac/editing/execCommand/hilitecolor-expected.txt: Removed.
		21	* platform/qt/editing/execCommand/hilitecolor-expected.txt: Removed.
		22
1	2010-07-23 James Robinson <jamesr@chromium.org>	23	2010-07-23 James Robinson <jamesr@chromium.org>
2		24
3	Unreviewed. Add chromium expectations for new tests.	25	Unreviewed. Add chromium expectations for new tests.

Line 0 LayoutTests/editing/execCommand/hilitecolor-expected.txt_sec1
- LayoutTests/editing/execCommand/hilitecolor-expected.txt +21 lines
	1	EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
	2	EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
	3	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
	4	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
	5	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
	6	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
	7	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
	8	EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
	9	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
	10	EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
	11	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
	12	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
	13	EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
	14
	15	<DIV id="test" contentEditable="true">
	16	<#text><selection-caret>The </#text>
	17	<SPAN style="background-color: red;" class="Apple-style-span">
	18	<#text>second</#text>
	19	</SPAN>
	20	<#text> word, and only the second word of this sentence should have a red background color.</#text>
	21	</DIV>

Lines 1-10 LayoutTests/editing/execCommand/hilitecolor.html_sec1
- LayoutTests/editing/execCommand/hilitecolor.html -4 / +5 lines
		1	<script src="../../resources/dump-as-markup.js"></script>
		2	<div id="test" contenteditable="true">The second word, and only the second word of this sentence should have a red background color.</div>
1	<script>	3	<script>
2	if (window.layoutTestController)	4	if (window.layoutTestController)
3	layoutTestController.dumpEditingCallbacks();	5	layoutTestController.dumpEditingCallbacks();
4	</script>
5	<div id="test" contenteditable="true">The second word, and only the second word of this sentence should have a red background color.</div>
6		6
7	<script>
8	var sel = window.getSelection();	7	var sel = window.getSelection();
9	var e = document.getElementById("test");	8	var e = document.getElementById("test");
10		9
Lines 14-17 sel.modify("move", "forward", "word"); LayoutTests/editing/execCommand/hilitecolor.html_sec2
14	sel.modify("extend", "backward", "word");	13	sel.modify("extend", "backward", "word");
15	document.execCommand("HiliteColor", false, "red");	14	document.execCommand("HiliteColor", false, "red");
16	sel.modify("move", "backward", "line");	15	sel.modify("move", "backward", "line");
17	</script>	16
		17	Markup.setNodeToDump('test')
		18	</script>

Lines 1-6 LayoutTests/editing/style/remove-underline-from-stylesheet.html_sec1
- LayoutTests/editing/style/remove-underline-from-stylesheet.html -7 / +4 lines
1	<html>	1	<html>
2	<head>	2	<head>
3
4	<style>	3	<style>
5	.editing {	4	.editing {
6	border: 2px solid red;	5	border: 2px solid red;
Lines 9-16 LayoutTests/editing/style/remove-underline-from-stylesheet.html_sec2
9	text-decoration: underline;	8	text-decoration: underline;
10	}	9	}
11	</style>	10	</style>
		11	<script src="../../resources/dump-as-markup.js"></script>
12	<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>	12	<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
13
14	<script>	13	<script>
15		14
16	function editingTest() {	15	function editingTest() {
Lines 32-49 function editingTest() { LayoutTests/editing/style/remove-underline-from-stylesheet.html_sec3
32	}	31	}
33		32
34	</script>	33	</script>
35		34	<title>Editing Test</title>
36	<title>Editing Test</title>
37	</head>	35	</head>
38	<body>	36	<body>
39	<p>This tests removing underline from stylesheet. For consistency, underline should NOT be removed (see bug 27809).</p>
40	<div contenteditable id="root" class="editing">	37	<div contenteditable id="root" class="editing">
41	<span id="test"></span>	38	<span id="test"></span>
42	</div>	39	</div>
43
44	<script>	40	<script>
		41	Markup.description('This tests removing underline from stylesheet (.editing has underline). Because text-decoration that comes from a style rule cannot be pushed down, the underline should stay. (see bug 27809).');
		42	Markup.setNodeToDump('root');
45	runEditingTest();	43	runEditingTest();
46	</script>	44	</script>
47
48	</body>	45	</body>
49	</html>	46	</html>

Lines 1-25 LayoutTests/platform/qt/editing/execCommand/hilitecolor-expected.txt_sec1
- LayoutTests/platform/qt/editing/execCommand/hilitecolor-expected.txt -25 lines
1	EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 1 of DIV > BODY > HTML > #document
2	EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
3	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
4	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
5	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
6	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
7	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
8	EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of #text > SPAN > DIV > BODY > HTML > #document to 6 of #text > SPAN > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
9	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
10	EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
11	EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
12	layer at (0,0) size 800x600
13	RenderView at (0,0) size 800x600
14	layer at (0,0) size 800x600
15	RenderBlock {HTML} at (0,0) size 800x600
16	RenderBody {BODY} at (8,8) size 784x584
17	RenderBlock {DIV} at (0,0) size 784x19
18	RenderText {#text} at (0,0) size 29x19
19	text run at (0,0) width 29: "The "
20	RenderInline {SPAN} at (0,0) size 46x19 [bgcolor=#FF0000]
21	RenderText {#text} at (29,0) size 46x19
22	text run at (29,0) width 46: "second"
23	RenderText {#text} at (75,0) size 546x19
24	text run at (75,0) width 546: " word, and only the second word of this sentence should have a red background color."
25	caret: position 0 of child 0 {#text} of child 0 {DIV} of body