Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

browser(webkit): do not show popup menu in mac headless (#2803)

Browse source
This commit is contained in:
Dmitry Gozman 2020-07-01 17:52:25 -07:00 committed by GitHub
parent e8e45e8450
commit c188118d3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser_patches/webkit/BUILD_NUMBER
View file

@ -1 +1 @@
1295 1296

17
browser_patches/webkit/patches/bootstrap.diff
View file

@ -13187,7 +13187,7 @@ index 53203c0bab7e8fc2f1b75d340c055c938590050e..207c96011155c51a398c3cb46b7beb32
void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&) override; void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&) override;
void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override; void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override;
diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
index 7b7e66c79edaf84a8a14756524e16c26e57896c6..868c8bc1e3b74e3318c56e568a18d768bc8ccd27 100644 index 7b7e66c79edaf84a8a14756524e16c26e57896c6..2d6224b2bad15eaf808101dec24026b3955cad88 100644
--- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm --- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
+++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm +++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
@@ -78,6 +78,7 @@ @@ -78,6 +78,7 @@
@ -13252,7 +13252,7 @@ index 7b7e66c79edaf84a8a14756524e16c26e57896c6..868c8bc1e3b74e3318c56e568a18d768
} }
void PageClientImpl::toolTipChanged(const String& oldToolTip, const String& newToolTip) void PageClientImpl::toolTipChanged(const String& oldToolTip, const String& newToolTip)
@@ -445,6 +463,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect) @@ -445,11 +463,15 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled) void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled)
{ {
@ -13261,7 +13261,14 @@ index 7b7e66c79edaf84a8a14756524e16c26e57896c6..868c8bc1e3b74e3318c56e568a18d768
m_impl->doneWithKeyEvent(event.nativeEvent(), eventWasHandled); m_impl->doneWithKeyEvent(event.nativeEvent(), eventWasHandled);
} }
@@ -562,6 +582,12 @@ CALayer *PageClientImpl::acceleratedCompositingRootLayer() const RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy& page)
{
+ if (_headless)
+ return nullptr;
return WebPopupMenuProxyMac::create(m_view, page);
}
@@ -562,6 +584,12 @@ CALayer *PageClientImpl::acceleratedCompositingRootLayer() const
return m_impl->acceleratedCompositingRootLayer(); return m_impl->acceleratedCompositingRootLayer();
} }
@ -13274,7 +13281,7 @@ index 7b7e66c79edaf84a8a14756524e16c26e57896c6..868c8bc1e3b74e3318c56e568a18d768
RefPtr<ViewSnapshot> PageClientImpl::takeViewSnapshot(Optional<WebCore::IntRect>&&) RefPtr<ViewSnapshot> PageClientImpl::takeViewSnapshot(Optional<WebCore::IntRect>&&)
{ {
return m_impl->takeViewSnapshot(); return m_impl->takeViewSnapshot();
@@ -740,6 +766,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR @@ -740,6 +768,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR
#endif // ENABLE(FULLSCREEN_API) #endif // ENABLE(FULLSCREEN_API)
@ -13288,7 +13295,7 @@ index 7b7e66c79edaf84a8a14756524e16c26e57896c6..868c8bc1e3b74e3318c56e568a18d768
void PageClientImpl::navigationGestureDidBegin() void PageClientImpl::navigationGestureDidBegin()
{ {
m_impl->dismissContentRelativeChildWindowsWithAnimation(true); m_impl->dismissContentRelativeChildWindowsWithAnimation(true);
@@ -906,6 +939,9 @@ void PageClientImpl::didRestoreScrollPosition() @@ -906,6 +941,9 @@ void PageClientImpl::didRestoreScrollPosition()
bool PageClientImpl::windowIsFrontWindowUnderMouse(const NativeWebMouseEvent& event) bool PageClientImpl::windowIsFrontWindowUnderMouse(const NativeWebMouseEvent& event)
{ {