cherry-pick(microsoft#11481): fix(webkit): improve orientation detection

aslushnikov · Jan 19, 2022 · ff7b9ad · ff7b9ad
1 parent ab2643c
commit ff7b9ad
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/packages/playwright-core/src/server/webkit/wkPage.ts b/packages/playwright-core/src/server/webkit/wkPage.ts
@@ -728,6 +728,11 @@ export class WKPage implements PageDelegate {
 
   private _calculateBootstrapScript(): string {
     const scripts: string[] = [];
+    if (!this._page.context()._options.isMobile) {
+      scripts.push('delete window.orientation');
+      scripts.push('delete window.ondevicemotion');
+      scripts.push('delete window.ondeviceorientation');
+    }
     for (const binding of this._page.allBindings())
       scripts.push(this._bindingToScript(binding));
     scripts.push(...this._browserContext._evaluateOnNewDocumentSources);

diff --git a/tests/assets/modernizr.html b/tests/assets/modernizr.html
@@ -10,6 +10,11 @@
   let value = Modernizr[name];
   report[name] = value;
 }
+
+report['devicemotion2'] = 'ondevicemotion' in window;
+report['deviceorientation2'] = 'orientation' in window;
+report['deviceorientation3'] = 'ondeviceorientation' in window;
+
 document.body.style.whiteSpace = 'pre';
 document.body.textContent = JSON.stringify(report, undefined, 4);
 window.report = JSON.parse(document.body.textContent);

diff --git a/tests/assets/modernizr/mobile-safari-14-1.json b/tests/assets/modernizr/mobile-safari-14-1.json
@@ -90,7 +90,10 @@
   "promises": true,
   "es6string": true,
   "devicemotion": true,
+  "devicemotion2": true,
   "deviceorientation": true,
+  "deviceorientation2": true,
+  "deviceorientation3": true,
   "filereader": true,
   "urlparser": true,
   "urlsearchparams": true,

diff --git a/tests/assets/modernizr/safari-14-1.json b/tests/assets/modernizr/safari-14-1.json
@@ -90,7 +90,10 @@
   "promises": true,
   "es6string": true,
   "devicemotion": false,
+  "devicemotion2": false,
   "deviceorientation": false,
+  "deviceorientation2": false,
+  "deviceorientation3": false,
   "filereader": true,
   "urlparser": true,
   "urlsearchparams": true,