Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 17 insertions, 7 deletions

diff --git a/remote/test/puppeteer/packages/puppeteer-core/src/cdp/EmulationManager.ts b/remote/test/puppeteer/packages/puppeteer-core/src/cdp/EmulationManager.ts
index 8598967fe7..823b3b462e 100644
--- a/remote/test/puppeteer/packages/puppeteer-core/src/cdp/EmulationManager.ts
+++ b/remote/test/puppeteer/packages/puppeteer-core/src/cdp/EmulationManager.ts
@@ -267,13 +267,23 @@ export class EmulationManager {
     const hasTouch = viewport.hasTouch || false;
 
     await Promise.all([
-      client.send('Emulation.setDeviceMetricsOverride', {
-        mobile,
-        width,
-        height,
-        deviceScaleFactor,
-        screenOrientation,
-      }),
+      client
+        .send('Emulation.setDeviceMetricsOverride', {
+          mobile,
+          width,
+          height,
+          deviceScaleFactor,
+          screenOrientation,
+        })
+        .catch(err => {
+          if (
+            err.message.includes('Target does not support metrics override')
+          ) {
+            debugError(err);
+            return;
+          }
+          throw err;
+        }),
       client.send('Emulation.setTouchEmulationEnabled', {
         enabled: hasTouch,
       }),