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

Backout e123e0173185, 326ed6f1dc9e & 7c2c9c988869 (bug 722979) for mochitest-a11y failures

Browse Source
This commit is contained in:
Ed Morley
2012-11-16 15:06:13 +00:00
parent 84fa257b4a
commit d7ff99bb34
26 changed files with 183 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docshell/base/nsDocShell.cpp
View File

@@ -114,7 +114,6 @@
#include "nsIObserver.h"
#include "nsINestedURI.h"
#include "nsITransportSecurityInfo.h"
#include "nsISSLSocketControl.h"
#include "nsINSSErrorsService.h"
#include "nsIApplicationCache.h"
#include "nsIApplicationCacheChannel.h"
@@ -4175,14 +4174,9 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI *aURI,
nsCOMPtr<nsIStrictTransportSecurityService> stss =
do_GetService(NS_STSSERVICE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
uint32_t flags = 0;
nsCOMPtr<nsISSLSocketControl> socketControl = do_QueryInterface(tsi);
if (socketControl) {
socketControl->GetProviderFlags(&flags);
}
bool isStsHost = false;
rv = stss->IsStsURI(aURI, flags, &isStsHost);
rv = stss->IsStsURI(aURI, &isStsHost);
NS_ENSURE_SUCCESS(rv, rv);
uint32_t bucketId;