nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1649879 - Remove URIFixupChild. r=kmag

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D81946
This commit is contained in:
Matt Woodrow 2020-07-08 23:37:59 +00:00
parent 6aac98f0a2
commit 8575748f00
5 changed files with 0 additions and 61 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

35
browser/actors/URIFixupChild.jsm
View file

@ -1,35 +0,0 @@
/* vim: set ts=2 sw=2 sts=2 et tw=80: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
var EXPORTED_SYMBOLS = ["URIFixupChild"];
const { ActorChild } = ChromeUtils.import(
"resource://gre/modules/ActorChild.jsm"
);
class URIFixupChild extends ActorChild {
observe(subject) {
let fixupInfo = subject.QueryInterface(Ci.nsIURIFixupInfo);
if (!fixupInfo.consumer || fixupInfo.consumer != this.browsingContext) {
return;
}
let data = {};
for (let f of Object.keys(fixupInfo)) {
if (f == "consumer" || typeof fixupInfo[f] == "function") {
continue;
}
if (fixupInfo[f] && fixupInfo[f] instanceof Ci.nsIURI) {
data[f] = fixupInfo[f].spec;
} else {
data[f] = fixupInfo[f];
}
}
this.mm.sendAsyncMessage("Browser:URIFixup", data);
}
}

1
browser/actors/moz.build
View file

@ -76,7 +76,6 @@ FINAL_TARGET_FILES.actors += [
'SearchTelemetryChild.jsm', 'SearchTelemetryChild.jsm',
'SearchTelemetryParent.jsm', 'SearchTelemetryParent.jsm',
'SwitchDocumentDirectionChild.jsm', 'SwitchDocumentDirectionChild.jsm',
'URIFixupChild.jsm',
'WebRTCChild.jsm', 'WebRTCChild.jsm',
'WebRTCParent.jsm', 'WebRTCParent.jsm',
] ]

8
browser/base/content/browser.js
View file

@ -1966,10 +1966,6 @@ var gBrowserInit = {
Services.obs.addObserver(gXPInstallObserver, "addon-install-failed"); Services.obs.addObserver(gXPInstallObserver, "addon-install-failed");
Services.obs.addObserver(gXPInstallObserver, "addon-install-confirmation"); Services.obs.addObserver(gXPInstallObserver, "addon-install-confirmation");
Services.obs.addObserver(gXPInstallObserver, "addon-install-complete"); Services.obs.addObserver(gXPInstallObserver, "addon-install-complete");
window.messageManager.addMessageListener(
"Browser:URIFixup",
gKeywordURIFixup
);
Services.obs.addObserver(gKeywordURIFixup, "keyword-uri-fixup"); Services.obs.addObserver(gKeywordURIFixup, "keyword-uri-fixup");
BrowserOffline.init(); BrowserOffline.init();
@ -2508,10 +2504,6 @@ var gBrowserInit = {
"addon-install-confirmation" "addon-install-confirmation"
); );
Services.obs.removeObserver(gXPInstallObserver, "addon-install-complete"); Services.obs.removeObserver(gXPInstallObserver, "addon-install-complete");
window.messageManager.removeMessageListener(
"Browser:URIFixup",
gKeywordURIFixup
);
Services.obs.removeObserver(gKeywordURIFixup, "keyword-uri-fixup"); Services.obs.removeObserver(gKeywordURIFixup, "keyword-uri-fixup");
if (AppConstants.isPlatformAndVersionAtLeast("win", "10")) { if (AppConstants.isPlatformAndVersionAtLeast("win", "10")) {

6
browser/base/content/tab-content.js
View file

@ -20,12 +20,6 @@ ChromeUtils.defineModuleGetter(
"resource://gre/modules/BrowserUtils.jsm" "resource://gre/modules/BrowserUtils.jsm"
); );
var { ActorManagerChild } = ChromeUtils.import(
"resource://gre/modules/ActorManagerChild.jsm"
);
ActorManagerChild.attach(this, "browsers");
// BrowserChildGlobal // BrowserChildGlobal
var global = this; var global = this;

11
browser/components/BrowserGlue.jsm
View file

@ -584,16 +584,6 @@ let JSWINDOWACTORS = {
}, },
}; };
let LEGACY_ACTORS = {
URIFixup: {
child: {
module: "resource:///actors/URIFixupChild.jsm",
group: "browsers",
observers: ["keyword-uri-fixup"],
},
},
};
(function earlyBlankFirstPaint() { (function earlyBlankFirstPaint() {
if ( if (
AppConstants.platform == "macosx" || AppConstants.platform == "macosx" ||
@ -1185,7 +1175,6 @@ BrowserGlue.prototype = {
ActorManagerParent.addJSProcessActors(JSPROCESSACTORS); ActorManagerParent.addJSProcessActors(JSPROCESSACTORS);
ActorManagerParent.addJSWindowActors(JSWINDOWACTORS); ActorManagerParent.addJSWindowActors(JSWINDOWACTORS);
ActorManagerParent.addLegacyActors(LEGACY_ACTORS);
ActorManagerParent.flush(); ActorManagerParent.flush();
this._flashHangCount = 0; this._flashHangCount = 0;