Bug 629845 (1/2) - Don't make nsHTMLDocument::EditingStateChanged fails if BeginningOfDocument fails. r=ehsan a=blocking-final

This commit is contained in:
Mounir Lamouri 2011-02-11 01:59:37 +01:00
parent c7256ae292
commit 350253af3e
3 changed files with 61 additions and 2 deletions

View File

@ -3309,8 +3309,7 @@ nsHTMLDocument::EditingStateChanged()
// If we're entering the design mode, put the selection at the beginning of
// the document for compatibility reasons.
if (designMode && oldState == eOff) {
rv = editor->BeginningOfDocument();
NS_ENSURE_SUCCESS(rv, rv);
editor->BeginningOfDocument();
}
nsCOMArray<nsIStyleSheet> agentSheets;

View File

@ -71,6 +71,7 @@ _TEST_FILES = \
test_bug612447.html \
test_bug620906.html \
test_bug622371.html \
test_bug629845.html \
test_CF_HTML_clipboard.html \
test_contenteditable_focus.html \
test_contenteditable_text_input_handling.html \

View File

@ -0,0 +1,59 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=629845
-->
<head>
<title>Test for Bug 629845</title>
<script type="application/javascript" src="/MochiKit/packed.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=629845">Mozilla Bug 629845</a>
<p id="display"></p>
<script>
function initFrame(frame)
{
frame.contentWindow.document.designMode="on";
frame.contentWindow.document.writeln("<body></body>");
document.getElementsByTagName('button')[0].click();
}
function command(aName)
{
var frame = document.getElementsByTagName('iframe')[0];
var caught = false;
try {
frame.contentDocument.execCommand(aName, false, null);
} catch (e) {
caught = true;
}
ok(!caught, "No exception should have been thrown.");
// Stop the document load before finishing, just to be clean.
document.getElementsByTagName('iframe')[0].contentWindow.document.close();
SimpleTest.finish();
}
</script>
<div id="content">
<button type="button" onclick="command('bold');">Bold</button>
<iframe onload="initFrame(this);"></iframe>
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 629845 **/
SimpleTest.waitForExplicitFinish();
</script>
</pre>
</body>
</html>