BB 44045: Disable ML features. (e877c74a) · Commits · The Tor Project / Applications / Tor Browser

browser/base/content/browser-init.js

+1 −4

Original line number	Diff line number	Diff line
		@@ -1042,10 +1042,7 @@ var gBrowserInit = {
		ToolbarKeyboardNavigator.uninit();
		}

		// Bug 1952900 to allow switching to unload category without leaking
		ChromeUtils.importESModule(
		"moz-src:///browser/components/genai/LinkPreview.sys.mjs"
		).LinkPreview.teardown(window);
		// LinkPreview.sys.mjs is missing. tor-browser#44045.

		FirefoxViewHandler.uninit();

browser/base/content/nsContextMenu.sys.mjs

+10 −14

Original line number	Diff line number	Diff line
		@@ -13,8 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
		"resource://gre/modules/ContextualIdentityService.sys.mjs",
		DevToolsShim: "chrome://devtools-startup/content/DevToolsShim.sys.mjs",
		E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs",
		GenAI: "resource:///modules/GenAI.sys.mjs",
		LinkPreview: "moz-src:///browser/components/genai/LinkPreview.sys.mjs",
		// GenAI.sys.mjs and LinkPreview.sys.mjs are missing. tor-browser#44045.
		LoginHelper: "resource://gre/modules/LoginHelper.sys.mjs",
		LoginManagerContextMenu:
		"resource://gre/modules/LoginManagerContextMenu.sys.mjs",
		@@ -572,10 +571,8 @@ export class nsContextMenu {
		shouldShow && !isWindowPrivate && showContainers
		);
		this.showItem("context-openlinkincurrent", this.onPlainTextLink);
		this.showItem(
		"context-previewlink",
		lazy.LinkPreview.shouldShowContextMenu(this)
		);
		// LinkPreview.sys.mjs is missing. tor-browser#44045.
		this.showItem("context-previewlink", false);
		}

		initNavigationItems() {
		@@ -940,10 +937,10 @@ export class nsContextMenu {

		this.showAndFormatSearchContextItem();
		this.showTranslateSelectionItem();
		lazy.GenAI.buildAskChatMenu(
		document.getElementById("context-ask-chat"),
		this
		);
		// GenAI.sys.mjs is missing. tor-browser#44045.
		// Need to remove the element from the DOM since otherwise it will cause an
		// error due to `.menupopup === null`.
		document.getElementById("context-ask-chat")?.remove();

		// srcdoc cannot be opened separately due to concerns about web
		// content with about:srcdoc in location bar masquerading as trusted
		@@ -2323,10 +2320,9 @@ export class nsContextMenu {
		);
		}

		previewLink(url = this.linkURL) {
		// If we're in a view-source tab, remove the view-source: prefix
		url = url.replace(/^view-source:/, "");
		lazy.LinkPreview.handleContextMenuClick(url, this);
		previewLink(_url = this.linkURL) {
		// LinkPreview.sys.mjs is missing. Unexpected to reach here since
		// #context-previewlink is hidden. tor-browser#44045.
		}

		/**

browser/components/BrowserComponents.manifest

+2 −2

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ category browser-window-domcontentloaded resource:///modules/CustomizableUI.sys.

		category browser-window-delayed-startup resource:///modules/ContentAnalysis.sys.mjs ContentAnalysis.initialize
		category browser-window-delayed-startup resource:///modules/HomePage.sys.mjs HomePage.delayedStartup
		category browser-window-delayed-startup moz-src:///browser/components/genai/LinkPreview.sys.mjs LinkPreview.init
		# LinkPreview.sys.mjs is missing. tor-browser#44045.
		category browser-window-delayed-startup resource:///modules/ReportBrokenSite.sys.mjs ReportBrokenSite.init
		category browser-window-delayed-startup moz-src:///browser/components/search/SearchUIUtils.sys.mjs SearchUIUtils.init

		@@ -59,7 +59,7 @@ category browser-idle-startup resource:///modules/BuiltInThemes.sys.mjs BuiltInT
		category browser-idle-startup resource://gre/modules/RFPHelper.sys.mjs RFPHelper.init
		category browser-idle-startup resource://gre/modules/Blocklist.sys.mjs Blocklist.loadBlocklistAsync
		category browser-idle-startup moz-src:///browser/components/tabbrowser/TabUnloader.sys.mjs TabUnloader.init
		category browser-idle-startup resource:///modules/GenAI.sys.mjs GenAI.init
		# GenAI.sys.mjs is missing. tor-browser#44045.
		category browser-idle-startup resource:///modules/QuickSuggest.sys.mjs QuickSuggest.init
		category browser-idle-startup resource:///modules/UrlbarSearchTermsPersistence.sys.mjs UrlbarSearchTermsPersistence.init
		category browser-idle-startup moz-src:///browser/components/search/SERPCategorization.sys.mjs SERPCategorization.init

browser/components/DesktopActorRegistry.sys.mjs

+3 −42

Original line number	Diff line number	Diff line
		@@ -419,38 +419,7 @@ let JSWINDOWACTORS = {
		allFrames: true,
		},

		GenAI: {
		parent: {
		esModuleURI: "resource:///actors/GenAIParent.sys.mjs",
		},
		child: {
		esModuleURI: "resource:///actors/GenAIChild.sys.mjs",
		events: {
		mousedown: {},
		mouseup: {},
		},
		},
		allFrames: true,
		onAddActor(register, unregister) {
		let isRegistered = false;

		// Register the actor if we have a provider set and not yet registered
		const maybeRegister = () => {
		if (Services.prefs.getCharPref("browser.ml.chat.provider", "")) {
		if (!isRegistered) {
		register();
		isRegistered = true;
		}
		} else if (isRegistered) {
		unregister();
		isRegistered = false;
		}
		};

		Services.prefs.addObserver("browser.ml.chat.provider", maybeRegister);
		maybeRegister();
		},
		},
		// GenAIParent.sys.mjs and GenAIChild.sys.mjs are missing. tor-browser#44045.

		LightweightTheme: {
		child: {
		@@ -497,16 +466,8 @@ let JSWINDOWACTORS = {
		messageManagerGroups: ["browsers"],
		},

		LinkPreview: {
		parent: {
		esModuleURI: "resource:///actors/LinkPreviewParent.sys.mjs",
		},
		child: {
		esModuleURI: "resource:///actors/LinkPreviewChild.sys.mjs",
		},
		includeChrome: true,
		enablePreference: "browser.ml.linkPreview.enabled",
		},
		// LinkPreviewParent.sys.mjs and LinkPreviewChild.sys.mjs are missing.
		// tor-browser#44045.

		PageInfo: {
		child: {

browser/components/moz.build

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ DIRS += [
		"enterprisepolicies",
		"extensions",
		"firefoxview",
		"genai",
		# Exclude "genai" component. tor-browser#44045.
		"messagepreview",
		"migration",
		"newtab",