Bug 1391421 - Part 8 - Fix site identity handling. r?jwu draft
authorJan Henning <jh+bugzilla@buttercookie.de>
Fri, 15 Sep 2017 20:43:40 +0200
changeset 665943 7853703c2085bf8343c94ccda0917ebea425c6bc
parent 665942 82786f5f4a06b173652491d0d9695870bbc4e37e
child 665944 204e8544b1f33ccbd993b736b0398925924c8047
push id80226
push usermozilla@buttercookie.de
push dateSat, 16 Sep 2017 14:59:42 +0000
reviewersjwu
bugs1391421
milestone57.0a1
Bug 1391421 - Part 8 - Fix site identity handling. r?jwu Apparently this was broken ever since the original implementation. MozReview-Commit-ID: C1Q6PBYcvk3
mobile/android/chrome/content/browser.js
--- 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,