From 3dd09f04ef676485dc59f33fdffbf20bc4ca8035 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Thu, 2 Jul 2020 15:21:12 -0700 Subject: [PATCH] browser(webkit): close context menu on Windows when closing page (#2825) Review URL: https://github.com/aslushnikov/webkit/commit/358fd983a9d16ca5aa7bfde11e70af7db6ef2af4 --- browser_patches/webkit/BUILD_NUMBER | 4 ++-- browser_patches/webkit/patches/bootstrap.diff | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 635c89c1cc..4c91d913ad 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1300 -Changed: lushnikov@chromium.org Wed Jul 2 12:02:52 PDT 2020 +1301 +Changed: lushnikov@chromium.org Thu Jul 2 15:14:04 PDT 2020 diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index dd30318d4b..3ddcedf8b6 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -13742,7 +13742,7 @@ index 0000000000000000000000000000000000000000..135a60361fa8fbf907382625e7c8dd4e + +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp b/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp -index aa171f48bc40a96a86d951451b578f609c573fce..2a335dd6d0a8e2ce416acc940d66f177f6771f19 100644 +index aa171f48bc40a96a86d951451b578f609c573fce..c275d25f142ea265ef6b1805c7cfdc04aba758c0 100644 --- a/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp +++ b/Source/WebKit/UIProcess/win/WebContextMenuProxyWin.cpp @@ -122,5 +122,11 @@ WebContextMenuProxyWin::~WebContextMenuProxyWin() @@ -13752,7 +13752,7 @@ index aa171f48bc40a96a86d951451b578f609c573fce..2a335dd6d0a8e2ce416acc940d66f177 +void WebContextMenuProxyWin::hide() +{ + if (m_menu) -+ ::DestroyMenu(m_menu); ++ ::EndMenu(); +} + } // namespace WebKit