Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make the about:blank documents created by CreateAboutBlankContentViewer havethe same encoding as real about:blank documents (that is, UTF-8). Bug 380383,r+sr=jst

Browse Source
This commit is contained in:
bzbarsky@mit.edu 2007-06-07 00:13:04 -07:00
parent 72daeacf01
commit db2f43135f
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
content/html/document/test/Makefile.in
View File

@ -52,6 +52,7 @@ _TEST_FILES = test_bug1682.html \
test_bug311681.xhtml \
test_bug332848.xhtml \
test_bug359657.html \
test_bug380383.html \
$(NULL)
libs:: $(_TEST_FILES)

40
content/html/document/test/test_bug380383.html Normal file
View File

@ -0,0 +1,40 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=380383
-->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Test for Bug 380383</title>
<script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.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=380383">Mozilla Bug 380383</a>
<p id="display">
<iframe id="f1" name="f1"></iframe>
<iframe id="f2" name="f2"></iframe>
</p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script class="testbody" type="text/javascript">
/** Test for Bug 380383 **/
is($("f1").contentDocument.characterSet, "UTF-8",
"Unexpected charset for f1");
function runTest() {
is($("f2").contentDocument.characterSet, "UTF-8",
"Unexpected charset for f2");
}
addLoadEvent(runTest);
addLoadEvent(SimpleTest.finish);
SimpleTest.waitForExplicitFinish();
</script>
</pre>
</body>
</html>

4
layout/build/nsContentDLF.cpp
View File

@ -58,6 +58,7 @@
#include "nsIViewSourceChannel.h"
#include "imgILoader.h"
#include "nsIParser.h"
// plugins
#include "nsIPluginManager.h"
@ -381,6 +382,9 @@ nsContentDLF::CreateBlankDocument(nsILoadGroup *aLoadGroup,
// add a nice bow
if (NS_SUCCEEDED(rv)) {
blankDoc->SetDocumentCharacterSetSource(kCharsetFromDocTypeDefault);
blankDoc->SetDocumentCharacterSet(NS_LITERAL_CSTRING("UTF-8"));
*aDocument = blankDoc;
NS_ADDREF(*aDocument);
}