From 73db43e2dad2df9001abeb28af97ba2833f84f9a Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Wed, 9 Nov 2016 19:43:34 +0100
Subject: [PATCH] Bug 1316359 - autocomplete.xml must get userContextId from
 the attribute of the element instead using contentPrincipal, r=Gijs

---
 toolkit/content/widgets/autocomplete.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/toolkit/content/widgets/autocomplete.xml b/toolkit/content/widgets/autocomplete.xml
index 9e29ee16c4fe..05d95929cdd5 100644
--- a/toolkit/content/widgets/autocomplete.xml
+++ b/toolkit/content/widgets/autocomplete.xml
@@ -659,8 +659,10 @@
 
       <handler event="focus" phase="capturing"><![CDATA[
         this.attachController();
-        if (window.gBrowser) {
-          this.userContextId = window.gBrowser.selectedBrowser.contentPrincipal.originAttributes.userContextId;
+        if (window.gBrowser && window.gBrowser.selectedBrowser.hasAttribute("usercontextid")) {
+          this.userContextId = parseInt(window.gBrowser.selectedBrowser.getAttribute("usercontextid"));
+        } else {
+          this.userContextId = 0;
         }
       ]]></handler>