wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 660404. Allow storing the previous page in bfcache even if the new one is a multipart response. r=smaug

Browse Source
This commit is contained in:
Boris Zbarsky 2011-06-01 16:00:36 -04:00
parent dfe03c850a
commit 169ed5d1fc
5 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
content/base/src/nsDocument.cpp
View File

@ -7044,12 +7044,21 @@ nsDocument::CanSavePresentation(nsIRequest *aNewRequest)
PRBool hasMore = PR_FALSE;
// We want to bail out if we have any requests other than aNewRequest (or
// in the case when aNewRequest is a part of a multipart response the base
// channel the multipart response is coming in on).
nsCOMPtr<nsIChannel> baseChannel;
nsCOMPtr<nsIMultiPartChannel> part(do_QueryInterface(aNewRequest));
if (part) {
part->GetBaseChannel(getter_AddRefs(baseChannel));
}
while (NS_SUCCEEDED(requests->HasMoreElements(&hasMore)) && hasMore) {
nsCOMPtr<nsISupports> elem;
requests->GetNext(getter_AddRefs(elem));
nsCOMPtr<nsIRequest> request = do_QueryInterface(elem);
if (request && request != aNewRequest) {
if (request && request != aNewRequest && request != baseChannel) {
#ifdef DEBUG_PAGE_CACHE
nsCAutoString requestName, docSpec;
request->GetName(requestName);

3
docshell/test/Makefile.in
View File

@ -106,6 +106,9 @@ _TEST_FILES = \
test_framedhistoryframes.html \
test_windowedhistoryframes.html \
historyframes.html \
test_bug660404.html \
file_bug660404 \
file_bug660404^headers^ \
$(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)

5
docshell/test/file_bug660404 Normal file
View File

@ -0,0 +1,5 @@
--testingtesting
Content-Type: text/html
<script>opener.finishTest();</script>
--testingtesting--

1
docshell/test/file_bug660404^headers^ Normal file
View File

@ -0,0 +1 @@
Content-Type: multipart/x-mixed-replace; boundary="testingtesting"

49
docshell/test/test_bug660404.html Normal file
View File

@ -0,0 +1,49 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=660404
-->
<head>
<title>Test for Bug 660404</title>
<script type="application/javascript" src="/MochiKit/packed.js"></script>
<script type="application/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=660404">Mozilla Bug 660404</a>
<p id="display"></p>
<div id="content" style="display: none">
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 660404 **/
SimpleTest.waitForExplicitFinish();
var w;
function continueTest() {
// Do this async so the load event can finish firing
SimpleTest.executeSoon(function() {
w.onpagehide = function(ev) {
is(ev.persisted, true, "Should be bfcached when navigating to multipart");
}
w.location.href = "file_bug660404";
});
}
function finishTest() {
is(w.document.documentElement.textContent, "opener.finishTest();");
is(w.document.documentElement.innerHTML, "<head><script>opener.finishTest();</"+"script></head>");
w.close();
SimpleTest.finish();
}
// Have to open a new window, since there's no bfcache in subframes
w = window.open("data:text/html,<script>window.onload = function() { opener.continueTest(); }</"+"script>");
</script>
</pre>
</body>
</html>