Bug 1391421 - Part 8 - Fix site identity handling. r?jwu
"getEffectiveHost" further down expects the URI to be available - apparently this was broken ever since the original implementation.
MozReview-Commit-ID: C1Q6PBYcvk3
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -5587,22 +5587,22 @@ var IdentityHandler = {
locationObj.origin = location.origin;
} catch (ex) {
// Can sometimes throw if the URL being visited has no host/hostname,
// e.g. about:blank. The _state for these pages means we won't need these
// properties anyways, though.
}
this._lastLocation = locationObj;
- let uri = aBrowser.currentURI;
+ this._uri = aBrowser.currentURI;
try {
- uri = Services.uriFixup.createExposableURI(uri);
+ this._uri = Services.uriFixup.createExposableURI(this._uri);
} catch (e) {}
- let identityMode = this.getIdentityMode(aState, uri);
+ let identityMode = this.getIdentityMode(aState, this._uri);
let mixedDisplay = this.getMixedDisplayMode(aState);
let mixedActive = this.getMixedActiveMode(aState);
let trackingMode = this.getTrackingMode(aState, aBrowser);
let result = {
origin: locationObj.origin,
mode: {
identity: identityMode,
mixed_display: mixedDisplay,