[pull] main from mozilla-firefox:main

browser/base/content/browser-sync.js

@@ -19,6 +19,8 @@ const { UIState } = ChromeUtils.importESModule(
 );
 
 ChromeUtils.defineESModuleGetters(this, {
+  AIWindow:
+    "moz-src:///browser/components/aiwindow/ui/modules/AIWindow.sys.mjs",
   ASRouter: "resource:///modules/asrouter/ASRouter.sys.mjs",
   EnsureFxAccountsWebChannel:
     "resource://gre/modules/FxAccountsWebChannel.sys.mjs",
@@ -518,6 +520,7 @@ var gSync = {
         "browser/sync.ftl",
         "browser/syncedTabs.ftl",
         "browser/newtab/asrouter.ftl",
+        "preview/aiWindow.ftl",
       ],
       true
     ));
@@ -2384,9 +2387,13 @@ var gSync = {
       deleteLocalData: false,
     };
 
+    const bodyId = AIWindow.hasActiveAIWindows()
+      ? "fxa-signout-dialog-body-aiwindow"
+      : "fxa-signout-dialog-body";
+
     let [title, body, button, checkbox] = await document.l10n.formatValues([
       { id: "fxa-signout-dialog-title2" },
-      { id: "fxa-signout-dialog-body" },
+      { id: bodyId },
       { id: "fxa-signout-dialog2-button" },
       { id: "fxa-signout-dialog2-checkbox" },
     ]);

browser/base/content/browser-trustPanel.js

@@ -189,20 +189,19 @@ class TrustPanel {
 
   async onContentBlockingEvent(
     event,
-    webProgress,
+    _webProgress,
     _isSimulated,
     _previousState
   ) {
     // Only accept contentblocking events for uris that we initialised `updateIdentity`
     // with, this can go wrong if trustpanel is enabled mid page load.
-    if (!this.#enabled || webProgress.browsingContext.currentURI != this.#uri) {
+    if (!this.#enabled || !this.#uri) {
       return;
     }
 
     // First update all our internal state based on the allowlist and the
     // different blockers:
     this.anyDetected = false;
-    this.anyBlocking = false;
     this.#lastEvent = event;
 
     // Check whether the user has added an exception for this site.
@@ -219,7 +218,6 @@ class TrustPanel {
       // the data with the document directly.
       blocker.activated = blocker.isBlocking(event);
       this.anyDetected = this.anyDetected || blocker.isDetected(event);
-      this.anyBlocking = this.anyBlocking || blocker.activated;
     }
 
     if (this.#popup) {

browser/base/content/test/performance/browser_startup_flicker.js

@@ -27,17 +27,10 @@ add_task(async function () {
     let frame = frames[i],
       previousFrame = frames[i - 1];
     let rects = compareFrames(frame, previousFrame);
-    if (!alreadyFocused && isLikelyFocusChange(rects, frame)) {
-      todo(
-        false,
-        "bug 1445161 - the window should be focused at first paint, " +
-          rects.toSource()
-      );
-      continue;
-    }
-    alreadyFocused = true;
 
     let expectedRects = [];
+    let focusRects = [];
+
     rects = rects.filter(rect => {
       let width = frame.width;
 
@@ -83,14 +76,32 @@ add_task(async function () {
         }
       }
 
-      ok(false, "unexpected changed rect: " + rectText);
+      if (!alreadyFocused) {
+        focusRects.push(rect);
+      }
       return true;
     });
+
+    if (!alreadyFocused && isLikelyFocusChange(focusRects, frame)) {
+      todo(
+        false,
+        "bug 1445161 - the window should be focused at first paint, " +
+          focusRects.toSource()
+      );
+      continue;
+    }
+    alreadyFocused = true;
+
     if (!rects.length) {
       info("ignoring identical frame");
       continue;
     }
 
+    for (let rect of rects) {
+      let rectText = `${rect.toSource()}, window width: ${frame.width}`;
+      ok(false, "unexpected changed rect: " + rectText);
+    }
+
     await reportFlickerWithAPNG(previousFrame, frame, i, expectedRects);
     unexpectedRects += rects.length;
   }

browser/components/BrowserComponents.manifest

@@ -105,6 +105,7 @@ category browser-quit-application-granted resource://gre/modules/UpdateListener.
 #endif
 category browser-quit-application-granted moz-src:///browser/components/urlbar/UrlbarSearchTermsPersistence.sys.mjs UrlbarSearchTermsPersistence.uninit
 category browser-quit-application-granted moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs IPProtectionService.uninit
+category browser-quit-application-granted moz-src:///browser/components/aiwindow/ui/modules/AIWindow.sys.mjs AIWindow.uninit
 
 category search-service-notification moz-src:///browser/components/search/SearchUIUtils.sys.mjs SearchUIUtils.showSearchServiceNotification
 

browser/components/aiwindow/ui/modules/AIWindow.sys.mjs

@@ -17,15 +17,16 @@ ChromeUtils.defineESModuleGetters(lazy, {
   AIWindowMenu:
     "moz-src:///browser/components/aiwindow/ui/modules/AIWindowMenu.sys.mjs",
   BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs",
-  SearchService: "moz-src:///toolkit/components/search/SearchService.sys.mjs",
-  SearchUIUtils: "moz-src:///browser/components/search/SearchUIUtils.sys.mjs",
   ChatStore:
     "moz-src:///browser/components/aiwindow/ui/modules/ChatStore.sys.mjs",
   NewTabPagePreloading:
     "moz-src:///browser/components/tabbrowser/NewTabPagePreloading.sys.mjs",
+  ONLOGOUT_NOTIFICATION: "resource://gre/modules/FxAccountsCommon.sys.mjs",
   PanelMultiView:
     "moz-src:///browser/components/customizableui/PanelMultiView.sys.mjs",
   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
+  SearchService: "moz-src:///toolkit/components/search/SearchService.sys.mjs",
+  SearchUIUtils: "moz-src:///browser/components/search/SearchUIUtils.sys.mjs",
   MemoriesSchedulers:
     "moz-src:///browser/components/aiwindow/models/memories/MemoriesSchedulers.sys.mjs",
 });
@@ -62,6 +63,7 @@ export const AIWindow = {
     }
 
     ChromeUtils.defineLazyGetter(AIWindow, "chatStore", () => lazy.ChatStore);
+    Services.obs.addObserver(this, lazy.ONLOGOUT_NOTIFICATION);
     this._initialized = true;
 
     // On startup/restart, if the first window initialized is an
@@ -71,6 +73,42 @@ export const AIWindow = {
     }
   },
 
+  uninit() {
+    if (!this._initialized) {
+      return;
+    }
+    Services.obs.removeObserver(this, lazy.ONLOGOUT_NOTIFICATION);
+    this._initialized = false;
+  },
+
+  observe(_subject, topic) {
+    if (topic === lazy.ONLOGOUT_NOTIFICATION) {
+      this._onAccountLogout();
+    }
+  },
+
+  // Switches all active AI Windows back to classic mode when the user signs out
+  // of their Firefox Account.
+  _onAccountLogout() {
+    for (const win of Services.wm.getEnumerator("navigator:browser")) {
+      if (!win.closed && this.isAIWindowActive(win)) {
+        this.toggleAIWindow(win, false);
+      }
+    }
+  },
+
+  // Checks if there are any open AI Windows. It's used to determine if certain
+  // operations (like Account sign-out warnings) need to account for active AI
+  // Window sessions.
+  hasActiveAIWindows() {
+    for (const win of Services.wm.getEnumerator("navigator:browser")) {
+      if (!win.closed && this.isAIWindowActiveAndEnabled(win)) {
+        return true;
+      }
+    }
+    return false;
+  },
+
   _reconcileNewTabPages(win, previousNewTabURL) {
     const newTabURI = Services.io.newURI(win.BROWSER_NEW_TAB_URL);
     const oldTabURI = Services.io.newURI(previousNewTabURL);
@@ -194,13 +232,27 @@ export const AIWindow = {
       }
       aiWindowURI.data = initialURL;
       args.appendElement(aiWindowURI);
+    }
 
-      const aiOption = Cc["@mozilla.org/hash-property-bag;1"].createInstance(
+    let propBag;
+    try {
+      propBag = args.length > 1 && args.queryElementAt(1, Ci.nsIPropertyBag2);
+    } catch (e) {
+      console.error(
+        new Error(
+          "Tried to create AI window but property bag argument is wrong"
+        ),
+        propBag
+      );
+      return args;
+    }
+    if (!propBag) {
+      propBag = Cc["@mozilla.org/hash-property-bag;1"].createInstance(
         Ci.nsIWritablePropertyBag2
       );
-      aiOption.setPropertyAsBool("ai-window", aiWindow);
-      args.appendElement(aiOption);
+      args.appendElement(propBag);
     }
+    propBag.setPropertyAsBool("ai-window", true);
 
     return args;
   },

browser/components/aiwindow/ui/test/browser/browser.toml

@@ -61,3 +61,5 @@ support-files = [
 ["browser_sidebar_aiwindow.js"]
 
 ["browser_smartwindow_init.js"]
+
+["browser_smartwindow_tab_move.js"]

browser/components/aiwindow/ui/test/browser/browser_aiwindow_memories.js

@@ -68,7 +68,8 @@ add_task(async function test_memories_scheduler_on_init_with_aiwindow() {
 
   testWin.document.documentElement.setAttribute("ai-window", "");
 
-  AIWindow._initialized = false;
+  // Use uninit() to properly clean up observer before re-initializing
+  AIWindow.uninit();
   AIWindow.init(testWin);
 
   Assert.ok(
@@ -89,7 +90,8 @@ add_task(
       private: false,
     });
 
-    AIWindow._initialized = false;
+    // Use uninit() to properly clean up observer before re-initializing
+    AIWindow.uninit();
     AIWindow.init(testWin);
 
     Assert.ok(

browser/components/aiwindow/ui/test/browser/browser_aiwindow_switcher.js

@@ -235,3 +235,29 @@ add_task(async function test_switcher_repositions_on_pref_change() {
 
   await SpecialPowers.flushPrefEnv();
 });
+
+// Test that _onAccountLogout switches AI windows to classic mode
+add_task(async function test_onAccountLogout_switches_windows() {
+  const { AIWindow } = ChromeUtils.importESModule(
+    "moz-src:///browser/components/aiwindow/ui/modules/AIWindow.sys.mjs"
+  );
+
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.aiwindow.enabled", true]],
+  });
+
+  document.documentElement.setAttribute("ai-window", "");
+  Assert.ok(
+    AIWindow.isAIWindowActive(window),
+    "Window should start in AI mode"
+  );
+
+  AIWindow._onAccountLogout();
+
+  Assert.ok(
+    !AIWindow.isAIWindowActive(window),
+    "Window should switch to classic mode after logout"
+  );
+
+  await SpecialPowers.popPrefEnv();
+});

browser/components/aiwindow/ui/test/browser/browser_smartwindow_tab_move.js

@@ -0,0 +1,47 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+const { TabStateFlusher } = ChromeUtils.importESModule(
+  "resource:///modules/sessionstore/TabStateFlusher.sys.mjs"
+);
+
+// Move a tab to a new window, check the new window is also an AI window.
+add_task(async function test() {
+  let tab1 = await BrowserTestUtils.addTab(gBrowser, "about:blank");
+  let tab2 = await BrowserTestUtils.addTab(gBrowser, "about:blank");
+
+  is(gBrowser.multiSelectedTabsCount, 0, "Zero multiselected tabs");
+
+  AIWindow.toggleAIWindow(window, true);
+  registerCleanupFunction(() => {
+    AIWindow.toggleAIWindow(window, false);
+  });
+  await BrowserTestUtils.switchTab(gBrowser, tab1);
+  let prevBrowser = tab1.linkedBrowser;
+
+  let delayedStartupPromise = BrowserTestUtils.waitForNewWindow();
+  let newWindow = gBrowser.replaceTabsWithWindow(tab1);
+  await delayedStartupPromise;
+
+  ok(
+    !prevBrowser.frameLoader,
+    "the swapped-from browser's frameloader has been destroyed"
+  );
+
+  let gBrowser2 = newWindow.gBrowser;
+  ok(AIWindow.isAIWindowActive(newWindow), "The new window is an AI window");
+
+  is(gBrowser.visibleTabs.length, 2, "Two tabs now in the old window");
+  is(gBrowser2.visibleTabs.length, 1, "One tab in the new window");
+
+  tab1 = gBrowser2.visibleTabs[0];
+  ok(tab1, "Got a tab1");
+  await tab1.focus();
+
+  await TabStateFlusher.flush(tab1.linkedBrowser);
+
+  await BrowserTestUtils.closeWindow(newWindow);
+  await BrowserTestUtils.removeTab(tab2);
+});