Attachment #42226 for bug #30955

View Details Raw Unified Return to Bug 30955

| Differences between



2009-10-30  Enrica Casucci  <enrica@apple.com>

        Reviewed by NOBODY (OOPS!).

        REGRESSION: In Mail, Undo does not restore some characters I have deleted at the end of a line
        https://bugs.webkit.org/show_bug.cgi?id=30955
        <rdar://problem/7067033>
        
        When the command is deleteWordBackward or deleteWordForward
        we should not add to the open typing command, but
        create a new one.
        
        Test: editing/undo/undo-deleteWord.html

        * editing/TypingCommand.cpp:
        (WebCore::TypingCommand::deleteKeyPressed): Always start a new command if the granularity is
        not CharacterGranularity. 
        (WebCore::TypingCommand::forwardDeleteKeyPressed): Always start a new command if the granularity is
        not CharacterGranularity. 

2009-10-30  Pavel Feldman  <pfeldman@chromium.org>

        Reviewed by Timothy Hatcher.



    ASSERT(frame);
    
    EditCommand* lastEditCommand = frame->editor()->lastEditCommand();
    if (granularity == CharacterGranularity && isOpenForMoreTypingCommand(lastEditCommand)) {
        static_cast<TypingCommand*>(lastEditCommand)->deleteKeyPressed(granularity, killRing);
        return;
    }

    ASSERT(frame);
    
    EditCommand* lastEditCommand = frame->editor()->lastEditCommand();
    if (granularity == CharacterGranularity && isOpenForMoreTypingCommand(lastEditCommand)) {
        static_cast<TypingCommand*>(lastEditCommand)->forwardDeleteKeyPressed(granularity, killRing);
        return;
    }



2009-10-30  Enrica Casucci  <enrica@apple.com>

        Reviewed by NOBODY (OOPS!).

        REGRESSION: In Mail, Undo does not restore some characters I have deleted at the end of a line
        https://bugs.webkit.org/show_bug.cgi?id=30955
        <rdar://problem/7067033>
        
        * editing/undo/undo-deleteWord-expected.txt: Added.
        * editing/undo/undo-deleteWord.html: Added.

2009-10-30  Kenneth Rohde Christiansen  <kenneth@webkit.org>

        Unreviewed layout test fixes.

Line 0 LayoutTests/editing/undo/undo-deleteWord-expected.txt_sec1
- LayoutTests/editing/undo/undo-deleteWord-expected.txt +3 lines
	1	Tests:
	2	Undo a delete word after a series of insertText does not wipe out the entire content.
	3	one two three four



<html> 
<head>

<style>
.editing { 
    border: 2px solid red; 
}
.explanation { 
    border: 2px solid blue; 
    padding: 12px; 
    font-size: 24px; 
    margin-bottom: 24px;
}
.scenario { margin-bottom: 16px;}
.scenario:first-line { font-weight: bold; margin-bottom: 16px;}
</style>
<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>

<script>

function sendDeleteWordKey()
{
    var deleteWordModifiers;
    if (navigator.userAgent.search(/\bMac OS X\b/) != -1)
        deleteWordModifiers = ["altKey"];
    else
        deleteWordModifiers = ["ctrlKey"];

    if (window.eventSender)
        eventSender.keyDown(String.fromCharCode(8), deleteWordModifiers);
    window.setTimeout(undoNow, 100);
}

function undoNow()
{
    document.execCommand("Undo");

    if (window.layoutTestController)
        layoutTestController.notifyDone();
}

function editingTest() {
    typeCharacterCommand('o');
    typeCharacterCommand('n');
    typeCharacterCommand('e');
    typeCharacterCommand(' ');
    typeCharacterCommand('t');
    typeCharacterCommand('w');
    typeCharacterCommand('o');
    typeCharacterCommand(' ');
    typeCharacterCommand('t');
    typeCharacterCommand('h');
    typeCharacterCommand('r');
    typeCharacterCommand('e');
    typeCharacterCommand('e');
    typeCharacterCommand(' ');
    typeCharacterCommand('f');
    typeCharacterCommand('o');
    typeCharacterCommand('u');
    typeCharacterCommand('r');

    window.setTimeout(sendDeleteWordKey, 100);
}

</script>

<title>Editing Test</title> 
</head> 
<body>

<div class="explanation">
<div class="scenario">
Tests: 
<br>
Undo a delete word after a series of insertText does not wipe out the entire content.
</div>
</div>

<div contenteditable id="root">
<div id="test" class="editing"></div>
</div>

<script>
if (window.layoutTestController) {
    layoutTestController.dumpAsText();
    layoutTestController.waitUntilDone();
}

var selection = window.getSelection();
selection.setPosition(document.getElementById("test"), 0);
editingTest();
</script>

</body>
</html>

Return to Bug 30955

Lines 90-96 void TypingCommand::deleteKeyPressed(Doc WebCore/editing/TypingCommand.cpp_sec1
- WebCore/editing/TypingCommand.cpp -2 / +2 lines
90	ASSERT(frame);	90	ASSERT(frame);
91		91
92	EditCommand* lastEditCommand = frame->editor()->lastEditCommand();	92	EditCommand* lastEditCommand = frame->editor()->lastEditCommand();
93	if (isOpenForMoreTypingCommand(lastEditCommand)) {	93	if (granularity == CharacterGranularity && isOpenForMoreTypingCommand(lastEditCommand)) {
94	static_cast<TypingCommand*>(lastEditCommand)->deleteKeyPressed(granularity, killRing);	94	static_cast<TypingCommand*>(lastEditCommand)->deleteKeyPressed(granularity, killRing);
95	return;	95	return;
96	}	96	}
Lines 109-115 void TypingCommand::forwardDeleteKeyPres WebCore/editing/TypingCommand.cpp_sec2
109	ASSERT(frame);	109	ASSERT(frame);
110		110
111	EditCommand* lastEditCommand = frame->editor()->lastEditCommand();	111	EditCommand* lastEditCommand = frame->editor()->lastEditCommand();
112	if (isOpenForMoreTypingCommand(lastEditCommand)) {	112	if (granularity == CharacterGranularity && isOpenForMoreTypingCommand(lastEditCommand)) {
113	static_cast<TypingCommand*>(lastEditCommand)->forwardDeleteKeyPressed(granularity, killRing);	113	static_cast<TypingCommand*>(lastEditCommand)->forwardDeleteKeyPressed(granularity, killRing);
114	return;	114	return;
115	}	115	}

Lines 1-3 WebCore/ChangeLog_sec1
- WebCore/ChangeLog +20 lines
		1	2009-10-30 Enrica Casucci <enrica@apple.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	REGRESSION: In Mail, Undo does not restore some characters I have deleted at the end of a line
		6	https://bugs.webkit.org/show_bug.cgi?id=30955
		7	<rdar://problem/7067033>
		8
		9	When the command is deleteWordBackward or deleteWordForward
		10	we should not add to the open typing command, but
		11	create a new one.
		12
		13	Test: editing/undo/undo-deleteWord.html
		14
		15	* editing/TypingCommand.cpp:
		16	(WebCore::TypingCommand::deleteKeyPressed): Always start a new command if the granularity is
		17	not CharacterGranularity.
		18	(WebCore::TypingCommand::forwardDeleteKeyPressed): Always start a new command if the granularity is
		19	not CharacterGranularity.
		20
1	2009-10-30 Pavel Feldman <pfeldman@chromium.org>	21	2009-10-30 Pavel Feldman <pfeldman@chromium.org>
2		22
3	Reviewed by Timothy Hatcher.	23	Reviewed by Timothy Hatcher.

Lines 1-3 LayoutTests/ChangeLog_sec1
- LayoutTests/ChangeLog +11 lines
		1	2009-10-30 Enrica Casucci <enrica@apple.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	REGRESSION: In Mail, Undo does not restore some characters I have deleted at the end of a line
		6	https://bugs.webkit.org/show_bug.cgi?id=30955
		7	<rdar://problem/7067033>
		8
		9	* editing/undo/undo-deleteWord-expected.txt: Added.
		10	* editing/undo/undo-deleteWord.html: Added.
		11
1	2009-10-30 Kenneth Rohde Christiansen <kenneth@webkit.org>	12	2009-10-30 Kenneth Rohde Christiansen <kenneth@webkit.org>
2		13
3	Unreviewed layout test fixes.	14	Unreviewed layout test fixes.

Line 0 LayoutTests/editing/undo/undo-deleteWord.html_sec1
- LayoutTests/editing/undo/undo-deleteWord.html +95 lines
		1	<html>
		2	<head>
		3
		4	<style>
		5	.editing {
		6	border: 2px solid red;
		7	}
		8	.explanation {
		9	border: 2px solid blue;
		10	padding: 12px;
		11	font-size: 24px;
		12	margin-bottom: 24px;
		13	}
		14	.scenario { margin-bottom: 16px;}
		15	.scenario:first-line { font-weight: bold; margin-bottom: 16px;}
		16	</style>
		17	<script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
		18
		19	<script>
		20
		21	function sendDeleteWordKey()
		22	{
		23	var deleteWordModifiers;
		24	if (navigator.userAgent.search(/\bMac OS X\b/) != -1)
		25	deleteWordModifiers = ["altKey"];
		26	else
		27	deleteWordModifiers = ["ctrlKey"];
		28
		29	if (window.eventSender)
		30	eventSender.keyDown(String.fromCharCode(8), deleteWordModifiers);
		31	window.setTimeout(undoNow, 100);
		32	}
		33
		34	function undoNow()
		35	{
		36	document.execCommand("Undo");
		37
		38	if (window.layoutTestController)
		39	layoutTestController.notifyDone();
		40	}
		41
		42	function editingTest() {
		43	typeCharacterCommand('o');
		44	typeCharacterCommand('n');
		45	typeCharacterCommand('e');
		46	typeCharacterCommand(' ');
		47	typeCharacterCommand('t');
		48	typeCharacterCommand('w');
		49	typeCharacterCommand('o');
		50	typeCharacterCommand(' ');
		51	typeCharacterCommand('t');
		52	typeCharacterCommand('h');
		53	typeCharacterCommand('r');
		54	typeCharacterCommand('e');
		55	typeCharacterCommand('e');
		56	typeCharacterCommand(' ');
		57	typeCharacterCommand('f');
		58	typeCharacterCommand('o');
		59	typeCharacterCommand('u');
		60	typeCharacterCommand('r');
		61
		62	window.setTimeout(sendDeleteWordKey, 100);
		63	}
		64
65	</script>
66
67	<title>Editing Test</title>
68	</head>
69	<body>
70
71	<div class="explanation">
72	<div class="scenario">
73	Tests:
74	<br>
75	Undo a delete word after a series of insertText does not wipe out the entire content.
76	</div>
77	</div>
78
79	<div contenteditable id="root">
80	<div id="test" class="editing"></div>
81	</div>
82
83	<script>
84	if (window.layoutTestController) {
85	layoutTestController.dumpAsText();
86	layoutTestController.waitUntilDone();
87	}
88
89	var selection = window.getSelection();
90	selection.setPosition(document.getElementById("test"), 0);
91	editingTest();
92	</script>
93
94	</body>
95	</html>