From 43cdb3ba7202ea91fed8905b4b70cde64a291549 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Wed, 1 Jul 2020 22:40:33 -0700
Subject: [PATCH] browser(webkit): revert #2755 (#2809)

Review URL: https://github.com/aslushnikov/webkit/commit/7d35d227989c616925e777c0ff50a6739ecd2f02

This reverts https://github.com/microsoft/playwright/pull/2755/files
Reason:
- it doesn't compile on Windows

References #2699
---
 browser_patches/webkit/BUILD_NUMBER           |  2 +-
 browser_patches/webkit/patches/bootstrap.diff | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER
index 70bdf7b71a..5b86c14e52 100644
--- a/browser_patches/webkit/BUILD_NUMBER
+++ b/browser_patches/webkit/BUILD_NUMBER
@@ -1 +1 @@
-1297
+1298
diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff
index 6327e9c73e..dd30318d4b 100644
--- a/browser_patches/webkit/patches/bootstrap.diff
+++ b/browser_patches/webkit/patches/bootstrap.diff
@@ -13742,19 +13742,10 @@ index 0000000000000000000000000000000000000000..135a60361fa8fbf907382625e7c8dd4e
 +
 +} // namespace WebKit
 diff --git a/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp b/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp
-index aa171f48bc40a96a86d951451b578f609c573fce..e948342089abdf57c80be77e25416743b63179a2 100644
+index aa171f48bc40a96a86d951451b578f609c573fce..2a335dd6d0a8e2ce416acc940d66f177f6771f19 100644
 --- a/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp
 +++ b/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp
-@@ -105,6 +105,8 @@ void WebContextMenuProxyWin::showContextMenuWithItems(Vector<Ref<WebContextMenuI
-     UINT flags = TPM_RIGHTBUTTON | TPM_TOPALIGN | TPM_VERPOSANIMATION | TPM_HORIZONTAL | TPM_LEFTALIGN | TPM_HORPOSANIMATION;
-     POINT pt { m_context.menuLocation().x(), m_context.menuLocation().y() };
-     HWND wnd = m_page.viewWidget();
-+    if (!::IsWindowVisibile(wnd))
-+        return;
-     ::ClientToScreen(wnd, &pt);
-     ::TrackPopupMenuEx(m_menu, flags, pt.x, pt.y, m_page.viewWidget(), nullptr);
- }
-@@ -122,5 +124,11 @@ WebContextMenuProxyWin::~WebContextMenuProxyWin()
+@@ -122,5 +122,11 @@ WebContextMenuProxyWin::~WebContextMenuProxyWin()
          ::DestroyMenu(m_menu);
  }