From f161a36a16ea77e4ec588ddafd73b1eab009dde2 Mon Sep 17 00:00:00 2001
From: Joel Einbinder <joel.einbinder@gmail.com>
Date: Wed, 8 Jan 2020 15:34:35 -0800
Subject: [PATCH] feat(webkit): roll webkit to 1076 (#431)

---
 package.json                   | 2 +-
 src/server/wkPlaywright.ts     | 3 +--
 src/webkit/wkNetworkManager.ts | 4 ++--
 test/geolocation.spec.js       | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 29de62182c..af0e625230 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   "playwright": {
     "chromium_revision": "724623",
     "firefox_revision": "1009",
-    "webkit_revision": "1070"
+    "webkit_revision": "1076"
   },
   "scripts": {
     "unit": "node test/test.js",
diff --git a/src/server/wkPlaywright.ts b/src/server/wkPlaywright.ts
index 8eece46e6e..cea3079161 100644
--- a/src/server/wkPlaywright.ts
+++ b/src/server/wkPlaywright.ts
@@ -120,8 +120,7 @@ export class WKPlaywright {
       webkitExecutable = executablePath;
     }
     webkitArguments.push('--inspector-pipe');
-    // Headless options is only implemented on Mac at the moment.
-    if (process.platform === 'darwin' && options.headless !== false)
+    if (options.headless !== false)
       webkitArguments.push('--headless');
 
     let connectOptions: WKConnectOptions | undefined = undefined;
diff --git a/src/webkit/wkNetworkManager.ts b/src/webkit/wkNetworkManager.ts
index 479b28e4c6..bd02def3ec 100644
--- a/src/webkit/wkNetworkManager.ts
+++ b/src/webkit/wkNetworkManager.ts
@@ -57,7 +57,7 @@ export class WKNetworkManager {
     const promises = [];
     promises.push(session.send('Network.enable'));
     if (interceptNetwork)
-      promises.push(session.send('Network.setInterceptionEnabled', { enabled: true }));
+      promises.push(session.send('Network.setInterceptionEnabled', { enabled: true, interceptRequests: true }));
     if (offlineMode)
       promises.push(session.send('Network.setEmulateOfflineState', { offline: true }));
     await Promise.all(promises);
@@ -73,7 +73,7 @@ export class WKNetworkManager {
   }
 
   async setRequestInterception(enabled: boolean): Promise<void> {
-    await this._session.send('Network.setInterceptionEnabled', { enabled });
+    await this._session.send('Network.setInterceptionEnabled', { enabled, interceptRequests: enabled });
   }
 
   async _updateProtocolCacheDisabled() {
diff --git a/test/geolocation.spec.js b/test/geolocation.spec.js
index a7fc0758e2..8d4d53ff8b 100644
--- a/test/geolocation.spec.js
+++ b/test/geolocation.spec.js
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-module.exports.describe = function ({ testRunner, expect, FFOX }) {
+module.exports.describe = function ({ testRunner, expect, FFOX, WEBKIT }) {
   const {describe, xdescribe, fdescribe} = testRunner;
   const {it, fit, xit, dit} = testRunner;
   const {beforeAll, beforeEach, afterAll, afterEach} = testRunner;
 
   // FIXME: not supported in WebKit (as well as Emulation domain in general).
   // It was removed from WebKit in https://webkit.org/b/126630
-  describe.skip(FFOX)('Overrides.setGeolocation', function() {
+  describe.skip(FFOX || WEBKIT)('Overrides.setGeolocation', function() {
     it('should work', async({page, server, context}) => {
       await context.setPermissions(server.PREFIX, ['geolocation']);
       await page.goto(server.EMPTY_PAGE);