зеркало из https://github.com/mozilla/gecko-dev.git
Bug 668513 - make the w3c tests for navigationtiming pass
r=smaug --HG-- extra : rebase_source : 791001cf9c9fa54448d9f5f25cf92de4b8cc8d5e
This commit is contained in:
Igor Bazarny
Родитель
7e94825de1
Коммит
c76c86d255
|
|
@ -677,7 +677,9 @@ ConvertLoadTypeToNavigationType(PRUint32 aLoadType)
|
|||
case LOAD_NORMAL_BYPASS_CACHE:
|
||||
case LOAD_NORMAL_BYPASS_PROXY:
|
||||
case LOAD_NORMAL_BYPASS_PROXY_AND_CACHE:
|
||||
case LOAD_NORMAL_REPLACE:
|
||||
case LOAD_LINK:
|
||||
case LOAD_STOP_CONTENT:
|
||||
result = nsIDOMPerformanceNavigation::TYPE_NAVIGATE;
|
||||
break;
|
||||
case LOAD_HISTORY:
|
||||
|
|
@ -690,8 +692,6 @@ ConvertLoadTypeToNavigationType(PRUint32 aLoadType)
|
|||
case LOAD_RELOAD_BYPASS_PROXY_AND_CACHE:
|
||||
result = nsIDOMPerformanceNavigation::TYPE_RELOAD;
|
||||
break;
|
||||
case LOAD_NORMAL_REPLACE:
|
||||
case LOAD_STOP_CONTENT:
|
||||
case LOAD_STOP_CONTENT_AND_REPLACE:
|
||||
case LOAD_REFRESH:
|
||||
case LOAD_BYPASS_HISTORY:
|
||||
|
|
|
|||
|
|
@ -113,6 +113,9 @@ _TEST_FILES = \
|
|||
file_bug662170.html \
|
||||
test_bug570341.html \
|
||||
bug570341_recordevents.html \
|
||||
test_bug668513.html \
|
||||
bug668513_redirect.html \
|
||||
bug668513_redirect.html^headers^ \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
<html><body>This document is redirected to a blank document.</body></html>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
HTTP 302 Moved Temporarily
|
||||
Location: navigation/blank.html
|
||||
|
|
@ -0,0 +1,114 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=668513
|
||||
-->
|
||||
<head>
|
||||
<title>Test for Bug 668513</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"/>
|
||||
<script>
|
||||
function onload_test()
|
||||
{
|
||||
var win = frames[0];
|
||||
ok(win.performance, 'Window.performance should be defined');
|
||||
ok(win.performance.navigation, 'Window.performance.navigation should be defined');
|
||||
var navigation = win.performance && win.performance.navigation;
|
||||
if (navigation === undefined)
|
||||
{
|
||||
// avoid script errors
|
||||
SimpleTest.finish();
|
||||
return;
|
||||
}
|
||||
|
||||
// do this with a timeout to see the visuals of the navigations.
|
||||
setTimeout("nav_frame();", 100);
|
||||
}
|
||||
|
||||
var step = 1;
|
||||
function nav_frame()
|
||||
{
|
||||
var navigation_frame = frames[0];
|
||||
var navigation = navigation_frame.performance.navigation;
|
||||
switch (step)
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
navigation_frame.location.href = 'bug570341_recordevents.html';
|
||||
step++;
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
{
|
||||
is(navigation.type, navigation.TYPE_NAVIGATE,
|
||||
'Expected window.performance.navigation.type == TYPE_NAVIGATE');
|
||||
navigation_frame.history.back();
|
||||
step++;
|
||||
break;
|
||||
}
|
||||
case 3:
|
||||
{
|
||||
is(navigation.type, navigation.TYPE_BACK_FORWARD,
|
||||
'Expected window.performance.navigation.type == TYPE_BACK_FORWARD');
|
||||
step++;
|
||||
navigation_frame.history.forward();
|
||||
break;
|
||||
}
|
||||
case 4:
|
||||
{
|
||||
is(navigation.type, navigation.TYPE_BACK_FORWARD,
|
||||
'Expected window.performance.navigation.type == TYPE_BACK_FORWARD');
|
||||
navigation_frame.location.href = 'bug668513_redirect.html';
|
||||
step++;
|
||||
break;
|
||||
}
|
||||
case 5:
|
||||
{
|
||||
is(navigation.type, navigation.TYPE_NAVIGATE,
|
||||
'Expected timing.navigation.type as TYPE_NAVIGATE');
|
||||
is(navigation.redirectCount, 1,
|
||||
'Expected navigation.redirectCount == 1 on an server redirected navigation');
|
||||
|
||||
var timing = navigation_frame.performance && navigation_frame.performance.timing;
|
||||
if (timing === undefined)
|
||||
{
|
||||
// avoid script errors
|
||||
SimpleTest.finish();
|
||||
break;
|
||||
}
|
||||
ok(timing.navigationStart > 0, 'navigationStart should be > 0');
|
||||
sequence = ['navigationStart', 'redirectStart', 'redirectEnd', 'fetchStart'];
|
||||
for (var j = 1; j < sequence.length; ++j) {
|
||||
var prop = sequence[j];
|
||||
var prevProp = sequence[j-1];
|
||||
ok(timing[prevProp] <= timing[prop],
|
||||
['Expected ', prevProp, ' to happen before ', prop,
|
||||
', got ', prevProp, ' = ', timing[prevProp],
|
||||
', ', prop, ' = ', timing[prop]].join(''));
|
||||
}
|
||||
step++;
|
||||
SimpleTest.finish();
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=668513">Mozilla Bug 668513</a>
|
||||
<div id="frames">
|
||||
<iframe name="child0" onload="onload_test();" src="navigation/blank.html"></iframe>
|
||||
</div>
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display: none">
|
||||
|
||||
</div>
|
||||
<pre id="test">
|
||||
<script type="application/javascript">
|
||||
SimpleTest.waitForExplicitFinish();
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -64,6 +64,7 @@ nsDOMNavigationTiming::Clear()
|
|||
mFetchStart = 0;
|
||||
mRedirectStart = 0;
|
||||
mRedirectEnd = 0;
|
||||
mRedirectCount = 0;
|
||||
mBeforeUnloadStart = 0;
|
||||
mUnloadStart = 0;
|
||||
mUnloadEnd = 0;
|
||||
|
|
@ -156,6 +157,7 @@ PRBool
|
|||
nsDOMNavigationTiming::ReportRedirects()
|
||||
{
|
||||
if (mRedirectCheck == NOT_CHECKED) {
|
||||
mRedirectCount = mRedirects.Count();
|
||||
if (mRedirects.Count() == 0) {
|
||||
mRedirectCheck = NO_REDIRECTS;
|
||||
} else {
|
||||
|
|
@ -166,6 +168,7 @@ nsDOMNavigationTiming::ReportRedirects()
|
|||
nsresult rv = ssm->CheckSameOriginURI(curr, mLoadedURI, PR_FALSE);
|
||||
if (!NS_SUCCEEDED(rv)) {
|
||||
mRedirectCheck = CHECK_FAILED;
|
||||
mRedirectCount = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -243,7 +246,7 @@ nsDOMNavigationTiming::GetRedirectCount(PRUint16* aRedirectCount)
|
|||
{
|
||||
*aRedirectCount = 0;
|
||||
if (ReportRedirects()) {
|
||||
*aRedirectCount = mRedirects.Count();
|
||||
*aRedirectCount = mRedirectCount;
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@ private:
|
|||
NO_REDIRECTS,
|
||||
CHECK_FAILED} RedirectCheckState;
|
||||
RedirectCheckState mRedirectCheck;
|
||||
PRInt16 mRedirectCount;
|
||||
|
||||
nsDOMPerformanceNavigationType mNavigationType;
|
||||
DOMTimeMilliSec mNavigationStart;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче