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

browser/base/content/browser-init.js

+1 −4

Original line number	Diff line number	Diff line
		@@ -1170,10 +1170,7 @@ var gBrowserInit = {
		gBrowser.removeTabsProgressListener(window.TabsProgressListener);
		} catch (ex) {}

		// 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.

		BrowserUtils.callModulesFromCategory(
		{ categoryName: "browser-window-unload", jsGlobal: globalThis },

browser/base/content/main-popupset.inc.xhtml

+3 −2

Original line number	Diff line number	Diff line
		@@ -64,12 +64,13 @@
		<menuitem id="context_duplicateTab" data-lazy-l10n-id="duplicate-tab" data-alt-l10n-id="duplicate-tab2"/>
		<menuitem id="context_duplicateTabs" data-lazy-l10n-id="duplicate-tabs" data-alt-l10n-id="duplicate-tabs2"/>
		<menuseparator id="context_tabStateSeparator"/>
		<menu id="context_askChat"/>
		<!-- Hide the GenAI menu. tor-browser#44554. -->
		<menu id="context_askChat" hidden="true"/>
		<!-- Flat "Summarize Page" item used by the alternate tab context menu layout
		in place of the #context_askChat submenu. Populated by
		GenAI.buildTabSummarizeItem; hidden by default. -->
		<menuitem id="context_askChatSummarize" hidden="true"/>
		<menuseparator id="context_aiSeparator"/>
		<menuseparator id="context_aiSeparator" hidden="true"/>
		<menuitem id="context_bookmarkSelectedTabs"
		hidden="true"
		data-lazy-l10n-id="bookmark-selected-tabs"

browser/base/content/nsContextMenu.sys.mjs

+10 −16

Original line number	Diff line number	Diff line
		@@ -15,8 +15,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
		"moz-src:///toolkit/components/contextualidentity/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",
		@@ -528,10 +527,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);
		let isHiddenTab = !!window.gBrowser?.getTabForBrowser(this.browser)?.hidden;
		let isPinnedTab = !!window.gBrowser?.getTabForBrowser(this.browser)?.pinned;
		this.showItem(
		@@ -906,12 +903,10 @@ export class nsContextMenu {

		this.showAndFormatSearchContextItem();
		this.showTranslateSelectionItem();
		lazy.GenAI.buildAskChatMenu(document.getElementById("context-ask-chat"), {
		browser: this.browser,
		selectionInfo: this.selectionInfo,
		showItem: this.showItem.bind(this),
		source: "page",
		});
		// 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
		@@ -2264,10 +2259,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
		@@ -62,7 +62,7 @@ category browser-window-load moz-src:///browser/components/customkeys/CustomKeys

		category browser-window-delayed-startup moz-src:///browser/components/contentanalysis/content/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 moz-src:///browser/components/reportbrokensite/ReportBrokenSite.sys.mjs ReportBrokenSite.init
		category browser-window-delayed-startup moz-src:///browser/components/search/SearchUIUtils.sys.mjs SearchUIUtils.init
		category browser-window-delayed-startup resource:///modules/taskbartabs/TaskbarTabsPageAction.sys.mjs TaskbarTabsPageAction.init
		@@ -173,7 +173,7 @@ category browser-idle-startup resource://gre/modules/RFPHelper.sys.mjs RFPHelper
		category browser-idle-startup resource://gre/modules/Blocklist.sys.mjs Blocklist.loadBlocklistAsync
		category browser-idle-startup resource://gre/modules/psm/RemoteSecuritySettings.sys.mjs RemoteSecuritySettings.init
		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 moz-src:///browser/components/urlbar/QuickSuggest.sys.mjs QuickSuggest.init
		category browser-idle-startup moz-src:///browser/components/urlbar/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 −55

Original line number	Diff line number	Diff line
		@@ -526,50 +526,7 @@ let JSWINDOWACTORS = {
		safeForUntrustedWebProcess: 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 an external chat provider is set, page summarization is enabled, or shortcuts are enabled
		const maybeRegister = () => {
		if (
		Services.prefs.getCharPref("browser.ml.chat.provider", "") \|\|
		Services.prefs.getBoolPref("browser.ml.chat.page") \|\|
		Services.prefs.getBoolPref("browser.ml.chat.shortcuts") \|\|
		Services.prefs.getBoolPref("browser.ml.chat.shortcuts.smartwindow")
		) {
		if (!isRegistered) {
		register();
		isRegistered = true;
		}
		} else if (isRegistered) {
		unregister();
		isRegistered = false;
		}
		};

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

		LightweightTheme: {
		child: {
		@@ -626,17 +583,8 @@ let JSWINDOWACTORS = {
		safeForUntrustedWebProcess: true,
		},

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

		PageAssist: {
		parent: {