wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-28 18:17:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Issue #756 - Remove Contextual Identity References from Pale Moon"

Browse source 
This reverts commit 9cdfabaf57.
This commit is contained in:
Roy Tam 2019-04-04 19:35:53 +08:00
commit 4d4a6085d0
4 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/palemoon/app/profile/palemoon.js
View file

@ -1089,6 +1089,8 @@ pref("browser.pagethumbnails.capturing_disabled", false);
// enables showing basic placeholders for missing thumbnails // enables showing basic placeholders for missing thumbnails
pref("browser.newtabpage.thumbnailPlaceholder", false); pref("browser.newtabpage.thumbnailPlaceholder", false);
pref("privacy.usercontext.about_newtab_segregation.enabled", false);
// number of columns of newtab grid // number of columns of newtab grid
pref("browser.newtabpage.columns", 4); pref("browser.newtabpage.columns", 4);

4
application/palemoon/base/content/browser.js
View file

@ -5338,6 +5338,9 @@ function handleDroppedLink(event, urlOrLinks, name)
let lastLocationChange = gBrowser.selectedBrowser.lastLocationChange; let lastLocationChange = gBrowser.selectedBrowser.lastLocationChange;
let userContextId = gBrowser.selectedBrowser
.getAttribute("usercontextid") || 0;
let inBackground = Services.prefs.getBoolPref("browser.tabs.loadInBackground"); let inBackground = Services.prefs.getBoolPref("browser.tabs.loadInBackground");
if (event.shiftKey) if (event.shiftKey)
inBackground = !inBackground; inBackground = !inBackground;
@ -5356,6 +5359,7 @@ function handleDroppedLink(event, urlOrLinks, name)
replace: true, replace: true,
allowThirdPartyFixup: false, allowThirdPartyFixup: false,
postDatas, postDatas,
userContextId,
}); });
} }
}); });

2
application/palemoon/base/content/content.js
View file

@ -139,6 +139,7 @@ var handleContentContextMenu = function (event) {
let selectionInfo = BrowserUtils.getSelectionDetails(content); let selectionInfo = BrowserUtils.getSelectionDetails(content);
let loadContext = docShell.QueryInterface(Ci.nsILoadContext); let loadContext = docShell.QueryInterface(Ci.nsILoadContext);
let userContextId = loadContext.originAttributes.userContextId;
let browser = docShell.chromeEventHandler; let browser = docShell.chromeEventHandler;
let mainWin = browser.ownerGlobal; let mainWin = browser.ownerGlobal;
@ -159,6 +160,7 @@ var handleContentContextMenu = function (event) {
selectionInfo: selectionInfo, selectionInfo: selectionInfo,
loginFillInfo, loginFillInfo,
parentAllowsMixedContent, parentAllowsMixedContent,
userContextId,
}; };
} }

26
application/palemoon/base/content/tabbrowser.xml
View file

@ -737,7 +737,8 @@
let autocomplete = this.mTabBrowser._placesAutocomplete; let autocomplete = this.mTabBrowser._placesAutocomplete;
if (this.mBrowser.registeredOpenURI) { if (this.mBrowser.registeredOpenURI) {
autocomplete.unregisterOpenPage(this.mBrowser.registeredOpenURI); autocomplete.unregisterOpenPage(this.mBrowser.registeredOpenURI,
this.mBrowser.getAttribute("usercontextid") || 0);
delete this.mBrowser.registeredOpenURI; delete this.mBrowser.registeredOpenURI;
} }
// Tabs in private windows aren't registered as "Open" so // Tabs in private windows aren't registered as "Open" so
@ -745,7 +746,8 @@
if (!isBlankPageURL(aLocation.spec) && if (!isBlankPageURL(aLocation.spec) &&
(!PrivateBrowsingUtils.isWindowPrivate(window) || (!PrivateBrowsingUtils.isWindowPrivate(window) ||
PrivateBrowsingUtils.permanentPrivateBrowsing)) { PrivateBrowsingUtils.permanentPrivateBrowsing)) {
autocomplete.registerOpenPage(aLocation); autocomplete.registerOpenPage(aLocation,
this.mBrowser.getAttribute("usercontextid") || 0);
this.mBrowser.registeredOpenURI = aLocation; this.mBrowser.registeredOpenURI = aLocation;
} }
} }
@ -1381,6 +1383,7 @@
let aTargetTab; let aTargetTab;
let aNewIndex = -1; let aNewIndex = -1;
let aPostDatas = []; let aPostDatas = [];
let aUserContextId;
if (arguments.length == 2 && if (arguments.length == 2 &&
typeof arguments[1] == "object") { typeof arguments[1] == "object") {
let params = arguments[1]; let params = arguments[1];
@ -1391,6 +1394,7 @@
aNewIndex = typeof params.newIndex === "number" ? aNewIndex = typeof params.newIndex === "number" ?
params.newIndex : aNewIndex; params.newIndex : aNewIndex;
aPostDatas = params.postDatas || aPostDatas; aPostDatas = params.postDatas || aPostDatas;
aUserContextId = params.userContextId;
} }
if (!aURIs.length) if (!aURIs.length)
@ -1439,7 +1443,8 @@
ownerTab: owner, ownerTab: owner,
skipAnimation: multiple, skipAnimation: multiple,
allowThirdPartyFixup: aAllowThirdPartyFixup, allowThirdPartyFixup: aAllowThirdPartyFixup,
postData: aPostDatas[0] postData: aPostDatas[0],
userContextId: aUserContextId
}); });
if (aNewIndex !== -1) { if (aNewIndex !== -1) {
this.moveTabTo(firstTabAdded, aNewIndex); this.moveTabTo(firstTabAdded, aNewIndex);
@ -1452,7 +1457,8 @@
let tab = this.addTab(aURIs[i], { let tab = this.addTab(aURIs[i], {
skipAnimation: true, skipAnimation: true,
allowThirdPartyFixup: aAllowThirdPartyFixup, allowThirdPartyFixup: aAllowThirdPartyFixup,
postData: aPostDatas[i] postData: aPostDatas[i],
userContextId: aUserContextId
}); });
if (targetTabIndex !== -1) if (targetTabIndex !== -1)
this.moveTabTo(tab, ++tabNum); this.moveTabTo(tab, ++tabNum);
@ -2053,7 +2059,8 @@
this.mTabListeners[aTab._tPos].destroy(); this.mTabListeners[aTab._tPos].destroy();
if (browser.registeredOpenURI && !aTabWillBeMoved) { if (browser.registeredOpenURI && !aTabWillBeMoved) {
this._placesAutocomplete.unregisterOpenPage(browser.registeredOpenURI); this._placesAutocomplete.unregisterOpenPage(browser.registeredOpenURI,
browser.getAttribute("usercontextid") || 0);
delete browser.registeredOpenURI; delete browser.registeredOpenURI;
} }
@ -2421,7 +2428,8 @@
<![CDATA[ <![CDATA[
// If the current URI is registered as open remove it from the list. // If the current URI is registered as open remove it from the list.
if (aOurBrowser.registeredOpenURI) { if (aOurBrowser.registeredOpenURI) {
this._placesAutocomplete.unregisterOpenPage(aOurBrowser.registeredOpenURI); this._placesAutocomplete.unregisterOpenPage(aOurBrowser.registeredOpenURI,
aOurBrowser.getAttribute("usercontextid") || 0);
delete aOurBrowser.registeredOpenURI; delete aOurBrowser.registeredOpenURI;
} }
@ -3331,7 +3339,8 @@
for (var i = 0; i < this.mTabListeners.length; ++i) { for (var i = 0; i < this.mTabListeners.length; ++i) {
let browser = this.getBrowserAtIndex(i); let browser = this.getBrowserAtIndex(i);
if (browser.registeredOpenURI) { if (browser.registeredOpenURI) {
this._placesAutocomplete.unregisterOpenPage(browser.registeredOpenURI); this._placesAutocomplete.unregisterOpenPage(browser.registeredOpenURI,
browser.getAttribute("usercontextid") || 0);
delete browser.registeredOpenURI; delete browser.registeredOpenURI;
} }
browser.webProgress.removeProgressListener(this.mTabFilters[i]); browser.webProgress.removeProgressListener(this.mTabFilters[i]);
@ -4790,6 +4799,8 @@
inBackground = !inBackground; inBackground = !inBackground;
let targetTab = this._getDragTargetTab(event); let targetTab = this._getDragTargetTab(event);
let userContextId = this.selectedItem
.getAttribute("usercontextid") || 0;
let replace = !(!targetTab || dropEffect == "copy"); let replace = !(!targetTab || dropEffect == "copy");
let newIndex = this._getDropIndex(event); let newIndex = this._getDropIndex(event);
let urls = links.map(link => link.url); let urls = links.map(link => link.url);
@ -4799,6 +4810,7 @@
allowThirdPartyFixup: true, allowThirdPartyFixup: true,
targetTab, targetTab,
newIndex, newIndex,
userContextId,
}); });
} }