From 6cddaccbac35a9bdf5ce4f194b4a607f45b65ab4 Mon Sep 17 00:00:00 2001 From: Jan Henning Date: Fri, 15 Sep 2017 20:43:40 +0200 Subject: [PATCH] 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 --HG-- extra : rebase_source : 5e71c300261ba9cbaff7e006ce22637c29596680 --- mobile/android/chrome/content/browser.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 533c8b8d3cb0..a305c3d117bc 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -5592,12 +5592,12 @@ var IdentityHandler = { } 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);