fix(firefox): wire screen context option through to Juggler

browser_patches/firefox/juggler/TargetRegistry.js

@@ -597,6 +597,7 @@ export class PageTarget {
     // Otherwise, explicitly set page viewport prevales over browser context
     // default viewport.
     const viewportSize = this._viewportSize || this._browserContext.defaultViewportSize;
+    const screenSize = this._screenSize || this._browserContext.defaultScreenSize;
     if (viewportSize) {
       const {width, height} = viewportSize;
       this._linkedBrowser.style.setProperty('width', width + 'px');
@@ -605,7 +606,15 @@ export class PageTarget {
       this._linkedBrowser.closest('.browserStack').style.setProperty('overflow', 'auto');
       this._linkedBrowser.closest('.browserStack').style.setProperty('contain', 'size');
       this._linkedBrowser.closest('.browserStack').style.setProperty('scrollbar-width', 'none');
-      this._linkedBrowser.browsingContext.inRDMPane = true;
+
+      const bc = this._linkedBrowser.browsingContext;
+      if (screenSize) {
+        bc.inRDMPane = false;
+        bc.setScreenAreaOverride(screenSize.width, screenSize.height);
+      } else {
+        bc.inRDMPane = true;
+        bc.resetScreenAreaOverride();
+      }
 
       const stackRect = this._linkedBrowser.closest('.browserStack').getBoundingClientRect();
       const toolbarTop = stackRect.y;
@@ -620,6 +629,7 @@ export class PageTarget {
       this._linkedBrowser.closest('.browserStack').style.removeProperty('contain');
       this._linkedBrowser.closest('.browserStack').style.removeProperty('scrollbar-width');
       this._linkedBrowser.browsingContext.inRDMPane = false;
+      this._linkedBrowser.browsingContext.resetScreenAreaOverride();
 
       const actualSize = this._linkedBrowser.getBoundingClientRect();
       await this._channel.connect('').send('awaitViewportDimensions', {
@@ -681,8 +691,9 @@ export class PageTarget {
     await this._channel.connect('').send('setInterceptFileChooserDialog', enabled).catch(e => {});
   }
 
-  async setViewportSize(viewportSize) {
+  async setViewportSize(viewportSize, screenSize) {
     this._viewportSize = viewportSize;
+    this._screenSize = screenSize;
     await this.updateViewportSize();
   }
 
@@ -890,6 +901,7 @@ class BrowserContext {
     this.ignoreHTTPSErrors = undefined;
     this.downloadOptions = undefined;
     this.defaultViewportSize = undefined;
+    this.defaultScreenSize = undefined;
     this.deviceScaleFactor = undefined;
     this.defaultUserAgent = null;
     this.timezoneOverride = undefined;
@@ -1029,6 +1041,7 @@ class BrowserContext {
 
   async setDefaultViewport(viewport) {
     this.defaultViewportSize = viewport ? viewport.viewportSize : undefined;
+    this.defaultScreenSize = viewport ? viewport.screenSize : undefined;
     this.deviceScaleFactor = viewport ? viewport.deviceScaleFactor : undefined;
     await Promise.all(Array.from(this.pages).map(page => page.updateViewportSize()));
   }

browser_patches/firefox/juggler/protocol/PageHandler.js

@@ -227,8 +227,8 @@ export class PageHandler {
     });
   }
 
-  async ['Page.setViewportSize']({viewportSize}) {
-    await this._pageTarget.setViewportSize(viewportSize === null ? undefined : viewportSize);
+  async ['Page.setViewportSize']({viewportSize, screenSize}) {
+    await this._pageTarget.setViewportSize(viewportSize === null ? undefined : viewportSize, screenSize === null ? undefined : screenSize);
   }
 
   async ['Page.setZoom']({zoom}) {

browser_patches/firefox/juggler/protocol/Protocol.js

@@ -77,6 +77,7 @@ pageTypes.Size = {
 pageTypes.Viewport = {
   viewportSize: pageTypes.Size,
   deviceScaleFactor: t.Optional(t.Number),
+  screenSize: t.Optional(pageTypes.Size),
 };
 
 pageTypes.DOMQuad = {
@@ -753,6 +754,7 @@ const Page = {
     'setViewportSize': {
       params: {
         viewportSize: t.Nullable(pageTypes.Size),
+        screenSize: t.Optional(t.Nullable(pageTypes.Size)),
       },
     },
     'setZoom': {

packages/playwright-core/src/server/firefox/ffBrowser.ts

@@ -362,9 +362,13 @@ export class FFBrowserContext extends BrowserContext {
   override async doUpdateDefaultViewport() {
     if (!this._options.viewport)
       return;
+    const screen = this._options.screen;
+    const defaultViewport = this._options.viewport;
     const viewport = {
-      viewportSize: { width: this._options.viewport.width, height: this._options.viewport.height },
+      viewportSize: { width: defaultViewport.width, height: defaultViewport.height },
       deviceScaleFactor: this._options.deviceScaleFactor || 1,
+      screenSize: screen && (screen.width !== defaultViewport.width || screen.height !== defaultViewport.height)
+          ? { width: screen.width, height: screen.height } : undefined,
     };
     await this._browser.session.send('Browser.setDefaultViewport', { browserContextId: this._browserContextId, viewport });
   }

packages/playwright-core/src/server/firefox/ffPage.ts

@@ -331,8 +331,15 @@ export class FFPage implements PageDelegate {
   }
 
   async updateEmulatedViewportSize(): Promise<void> {
-    const viewportSize = this._page.emulatedSize()?.viewport ?? null;
-    await this._session.send('Page.setViewportSize', { viewportSize });
+    const emulatedSize = this._page.emulatedSize();
+    const viewportSize = emulatedSize?.viewport ?? null;
+    const screenSize = emulatedSize?.screen ?? null;
+    const hasExplicitScreen = screenSize && viewportSize &&
+        (screenSize.width !== viewportSize.width || screenSize.height !== viewportSize.height);
+    await this._session.send('Page.setViewportSize', {
+      viewportSize,
+      screenSize: hasExplicitScreen ? screenSize : undefined,
+    });
   }
 
   async bringToFront(): Promise<void> {

tests/library/browsercontext-viewport.spec.ts

@@ -128,8 +128,7 @@ browserTest('should support touch with null viewport', async ({ browser, server
   await context.close();
 });
 
-it('should set both screen and viewport options', async ({ contextFactory, browserName, isBidi }) => {
-  it.fail(browserName === 'firefox' && !isBidi, 'Screen size is reset to viewport');
+it('should set both screen and viewport options', async ({ contextFactory }) => {
   const context = await contextFactory({
     screen: { 'width': 1280, 'height': 720 },
     viewport: { 'width': 1000, 'height': 600 },