From 6f67f6b52b4c69afcbc68b9b5848d08c00dd8295 Mon Sep 17 00:00:00 2001
From: zhengjitf <zhengjitf@gmail.com>
Date: Sat, 24 Jun 2023 02:34:09 +0800
Subject: [PATCH] fix(chromium): can get correct orientation angle on
 non-mobile devices (#23796)

Fix #23772
---
 .../playwright-core/src/server/chromium/crPage.ts    |  6 ++++--
 tests/library/browsercontext-viewport.spec.ts        | 12 ++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/playwright-core/src/server/chromium/crPage.ts b/packages/playwright-core/src/server/chromium/crPage.ts
index f3dfbf94a7..254b42dc3c 100644
--- a/packages/playwright-core/src/server/chromium/crPage.ts
+++ b/packages/playwright-core/src/server/chromium/crPage.ts
@@ -1008,7 +1008,7 @@ class FrameSession {
       return;
     const viewportSize = emulatedSize.viewport;
     const screenSize = emulatedSize.screen;
-    const isLandscape = viewportSize.width > viewportSize.height;
+    const isLandscape = screenSize.width > screenSize.height;
     const metricsOverride: Protocol.Emulation.setDeviceMetricsOverrideParameters = {
       mobile: !!options.isMobile,
       width: viewportSize.width,
@@ -1016,7 +1016,9 @@ class FrameSession {
       screenWidth: screenSize.width,
       screenHeight: screenSize.height,
       deviceScaleFactor: options.deviceScaleFactor || 1,
-      screenOrientation: isLandscape ? { angle: 90, type: 'landscapePrimary' } : { angle: 0, type: 'portraitPrimary' },
+      screenOrientation: !!options.isMobile ? (
+        isLandscape ? { angle: 90, type: 'landscapePrimary' } : { angle: 0, type: 'portraitPrimary' }
+      ) : { angle: 0, type: 'landscapePrimary' },
       dontSetVisibleSize: preserveWindowBoundaries
     };
     if (JSON.stringify(this._metricsOverride) === JSON.stringify(metricsOverride))
diff --git a/tests/library/browsercontext-viewport.spec.ts b/tests/library/browsercontext-viewport.spec.ts
index aad73489d7..6c37ee3ac9 100644
--- a/tests/library/browsercontext-viewport.spec.ts
+++ b/tests/library/browsercontext-viewport.spec.ts
@@ -163,3 +163,15 @@ it('WebKit Windows headed should have a minimal viewport', async ({ contextFacto
   await expect(page.setViewportSize({ width: 100, height: 100 })).rejects.toThrow('WebKit on Windows has a minimal viewport of 250x240.');
   await context.close();
 });
+
+browserTest('should be able to get correct orientation angle on non-mobile devices', async ({ browser, browserName, server }) => {
+  browserTest.skip(browserName === 'webkit', 'Desktop webkit dont support orientation API');
+
+  const context = await browser.newContext({ viewport: { width: 300, height: 400 }, isMobile: false });
+  const page = await context.newPage();
+  await page.goto(server.PREFIX + '/index.html');
+  expect(await page.evaluate(() => window.screen.orientation.angle)).toBe(0);
+  await page.setViewportSize({ width: 400, height: 300 });
+  expect(await page.evaluate(() => window.screen.orientation.angle)).toBe(0);
+  await context.close();
+});