From 4d4a6085d0189fde080b1753f50149c733c87ed6 Mon Sep 17 00:00:00 2001
From: Roy Tam <roytam@gmail.com>
Date: Thu, 4 Apr 2019 19:35:53 +0800
Subject: [PATCH] Revert "Issue #756 - Remove Contextual Identity References
 from Pale Moon"

This reverts commit 9cdfabaf5740fb78fd560a3f9a5dc3f8282a8b01.
---
 application/palemoon/app/profile/palemoon.js  |  2 ++
 application/palemoon/base/content/browser.js  |  4 +++
 application/palemoon/base/content/content.js  |  2 ++
 .../palemoon/base/content/tabbrowser.xml      | 26 ++++++++++++++-----
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index bd1b62cc3d..85dc41c152 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -1089,6 +1089,8 @@ pref("browser.pagethumbnails.capturing_disabled", false);
 // enables showing basic placeholders for missing thumbnails
 pref("browser.newtabpage.thumbnailPlaceholder", false);
 
+pref("privacy.usercontext.about_newtab_segregation.enabled", false);
+
 // number of columns of newtab grid
 pref("browser.newtabpage.columns", 4);
 
diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index 7672fa3a82..1e71292720 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -5338,6 +5338,9 @@ function handleDroppedLink(event, urlOrLinks, name)
 
   let lastLocationChange = gBrowser.selectedBrowser.lastLocationChange;
 
+  let userContextId = gBrowser.selectedBrowser
+                      .getAttribute("usercontextid") || 0;
+
   let inBackground = Services.prefs.getBoolPref("browser.tabs.loadInBackground");
   if (event.shiftKey)
     inBackground = !inBackground;
@@ -5356,6 +5359,7 @@ function handleDroppedLink(event, urlOrLinks, name)
         replace: true,
         allowThirdPartyFixup: false,
         postDatas,
+        userContextId,
       });
     }
   });
diff --git a/application/palemoon/base/content/content.js b/application/palemoon/base/content/content.js
index 211a24a8bb..653dac3e3f 100644
--- a/application/palemoon/base/content/content.js
+++ b/application/palemoon/base/content/content.js
@@ -139,6 +139,7 @@ var handleContentContextMenu = function (event) {
   let selectionInfo = BrowserUtils.getSelectionDetails(content);
 
   let loadContext = docShell.QueryInterface(Ci.nsILoadContext);
+  let userContextId = loadContext.originAttributes.userContextId;
 
   let browser = docShell.chromeEventHandler;
   let mainWin = browser.ownerGlobal;
@@ -159,6 +160,7 @@ var handleContentContextMenu = function (event) {
     selectionInfo: selectionInfo,
     loginFillInfo,
     parentAllowsMixedContent,
+    userContextId,
   };
 }
 
diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml
index 868179b5d5..cbe029af03 100644
--- a/application/palemoon/base/content/tabbrowser.xml
+++ b/application/palemoon/base/content/tabbrowser.xml
@@ -737,7 +737,8 @@
 
                 let autocomplete = this.mTabBrowser._placesAutocomplete;
                 if (this.mBrowser.registeredOpenURI) {
-                  autocomplete.unregisterOpenPage(this.mBrowser.registeredOpenURI);
+                  autocomplete.unregisterOpenPage(this.mBrowser.registeredOpenURI,
+                                                  this.mBrowser.getAttribute("usercontextid") || 0);
                   delete this.mBrowser.registeredOpenURI;
                 }
                 // Tabs in private windows aren't registered as "Open" so
@@ -745,7 +746,8 @@
                 if (!isBlankPageURL(aLocation.spec) &&
                     (!PrivateBrowsingUtils.isWindowPrivate(window) ||
                     PrivateBrowsingUtils.permanentPrivateBrowsing)) {
-                  autocomplete.registerOpenPage(aLocation);
+                  autocomplete.registerOpenPage(aLocation,
+                                                this.mBrowser.getAttribute("usercontextid") || 0);
                   this.mBrowser.registeredOpenURI = aLocation;
                 }
               }
@@ -1381,6 +1383,7 @@
           let aTargetTab;
           let aNewIndex = -1;
           let aPostDatas = [];
+          let aUserContextId;
           if (arguments.length == 2 &&
               typeof arguments[1] == "object") {
             let params = arguments[1];
@@ -1391,6 +1394,7 @@
             aNewIndex             = typeof params.newIndex === "number" ?
                                     params.newIndex : aNewIndex;
             aPostDatas            = params.postDatas || aPostDatas;
+            aUserContextId        = params.userContextId;
           }
 
           if (!aURIs.length)
@@ -1439,7 +1443,8 @@
               ownerTab: owner,
               skipAnimation: multiple,
               allowThirdPartyFixup: aAllowThirdPartyFixup,
-              postData: aPostDatas[0]
+              postData: aPostDatas[0],
+              userContextId: aUserContextId
             });
             if (aNewIndex !== -1) {
               this.moveTabTo(firstTabAdded, aNewIndex);
@@ -1452,7 +1457,8 @@
             let tab = this.addTab(aURIs[i], {
               skipAnimation: true,
               allowThirdPartyFixup: aAllowThirdPartyFixup,
-              postData: aPostDatas[i]
+              postData: aPostDatas[i],
+              userContextId: aUserContextId
             });
             if (targetTabIndex !== -1)
               this.moveTabTo(tab, ++tabNum);
@@ -2053,7 +2059,8 @@
             this.mTabListeners[aTab._tPos].destroy();
 
             if (browser.registeredOpenURI && !aTabWillBeMoved) {
-              this._placesAutocomplete.unregisterOpenPage(browser.registeredOpenURI);
+              this._placesAutocomplete.unregisterOpenPage(browser.registeredOpenURI,
+                                                          browser.getAttribute("usercontextid") || 0);
               delete browser.registeredOpenURI;
             }
 
@@ -2421,7 +2428,8 @@
           <![CDATA[
             // If the current URI is registered as open remove it from the list.
             if (aOurBrowser.registeredOpenURI) {
-              this._placesAutocomplete.unregisterOpenPage(aOurBrowser.registeredOpenURI);
+              this._placesAutocomplete.unregisterOpenPage(aOurBrowser.registeredOpenURI,
+                                                          aOurBrowser.getAttribute("usercontextid") || 0);
               delete aOurBrowser.registeredOpenURI;
             }
 
@@ -3331,7 +3339,8 @@
           for (var i = 0; i < this.mTabListeners.length; ++i) {
             let browser = this.getBrowserAtIndex(i);
             if (browser.registeredOpenURI) {
-              this._placesAutocomplete.unregisterOpenPage(browser.registeredOpenURI);
+              this._placesAutocomplete.unregisterOpenPage(browser.registeredOpenURI,
+                                                          browser.getAttribute("usercontextid") || 0);
               delete browser.registeredOpenURI;
             }
             browser.webProgress.removeProgressListener(this.mTabFilters[i]);
@@ -4790,6 +4799,8 @@
             inBackground = !inBackground;
 
           let targetTab = this._getDragTargetTab(event);
+          let userContextId = this.selectedItem
+                              .getAttribute("usercontextid") || 0;
           let replace = !(!targetTab || dropEffect == "copy");
           let newIndex = this._getDropIndex(event);
           let urls = links.map(link => link.url);
@@ -4799,6 +4810,7 @@
             allowThirdPartyFixup: true,
             targetTab,
             newIndex,
+            userContextId,
           });
         }