corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 668513 - make the w3c tests for navigationtiming pass

Browse Source 
r=smaug
This commit is contained in:
Igor Bazarny
2011-07-04 11:30:43 +02:00
parent b63df5ba30
commit 5fa36a007a
7 changed files with 127 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dom/base/nsDOMNavigationTiming.cpp
View File

@@ -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;
}