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 691547. Don't record a navigationStart for a docshell when one of its descendants navigates. r=bzbarsky

Browse Source
This commit is contained in:
Igor Bazarny 2011-11-08 11:51:20 -05:00
parent 5ff47a56c5
commit 8b10d6b949
4 changed files with 79 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docshell/base/nsDocShell.cpp
View File

@ -5875,13 +5875,13 @@ nsDocShell::OnStateChange(nsIWebProgress * aProgress, nsIRequest * aRequest,
// If load type is not set, this is not a 'normal' load. // If load type is not set, this is not a 'normal' load.
// No need to collect timing. // No need to collect timing.
if (mLoadType == 0) { if (mLoadType == 0) {
mTiming = nsnull; mTiming = nsnull;
} }
else { else if (this == aProgress){
rv = MaybeInitTiming(); rv = MaybeInitTiming();
} if (mTiming) {
if (mTiming) { mTiming->NotifyFetchStart(uri, ConvertLoadTypeToNavigationType(mLoadType));
mTiming->NotifyFetchStart(uri, ConvertLoadTypeToNavigationType(mLoadType)); }
} }
nsCOMPtr<nsIWyciwygChannel> wcwgChannel(do_QueryInterface(aRequest)); nsCOMPtr<nsIWyciwygChannel> wcwgChannel(do_QueryInterface(aRequest));

2
docshell/test/Makefile.in
View File

@ -122,6 +122,8 @@ _TEST_FILES = \
test_bfcache_plus_hash.html \ test_bfcache_plus_hash.html \
test_bug680257.html \ test_bug680257.html \
file_bug680257.html \ file_bug680257.html \
test_bug691547.html \
bug691547_frame.html \
$(NULL) $(NULL)
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)

12
docshell/test/bug691547_frame.html Normal file
View File

@ -0,0 +1,12 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=691547
-->
<head>
<title>Test for Bug 691547</title>
</head>
<body>
<iframe style="width:95%"></iframe>
</body>
</html>

59
docshell/test/test_bug691547.html Normal file
View File

@ -0,0 +1,59 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=691547
-->
<head>
<title>Test for Bug 691547</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="application/javascript">
var navStart = 0;
var beforeReload = 0;
function onContentLoad() {
var frame = frames[0];
if (!navStart) {
// First time we perform navigation in subframe. The bug is that
// load in subframe causes timing.navigationStart to be recorded
// as if it was a start of the next navigation.
var innerFrame = frame.frames[0];
navStart = frame.performance.timing.navigationStart;
innerFrame.location = 'bug570341_recordevents.html';
// Let's wait a bit so the difference is clear anough.
setTimeout(reload, 3000);
}
else {
// Content reloaded, time to check. We are allowing a huge time slack,
// in case clock is imprecise. If we have a bug, the difference is
// expected to be about the timeout value set above.
var diff = frame.performance.timing.navigationStart - beforeReload;
ok(diff >= -200,
'navigationStart should be set after reload request. ' +
'Measured difference: ' + diff + ' (should be positive)');
SimpleTest.finish();
}
}
function reload() {
var frame = frames[0];
ok(navStart == frame.performance.timing.navigationStart,
'navigationStart should not change when frame loads.');
beforeReload = Date.now();
frame.location.reload();
}
</script>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=570341">Mozilla Bug 570341</a>
<div id="frames">
<iframe name="frame0" id="frame0" src="bug691547_frame.html" onload="onContentLoad()"></iframe>
</div>
<div id="content" style="display: none">
</div>
<pre id="test">
<script type="application/javascript">
SimpleTest.waitForExplicitFinish();
</script>
</pre>
</body>
</html>