Skip to content

Commit afc0222

Browse files
authored
browser(webkit): do not crash when opening inspector on mac (#751)
1 parent 6faf74b commit afc0222

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

browser_patches/webkit/BUILD_NUMBER

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1121
1+
1122

browser_patches/webkit/patches/bootstrap.diff

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10189,7 +10189,7 @@ index 8016b56c160acc7b4269600f07f737b3793767bb..651a86c41af3305e215d7baf7f149cc7
1018910189
void navigationGestureWillEnd(bool willNavigate, WebBackForwardListItem&) override;
1019010190
void navigationGestureDidEnd(bool willNavigate, WebBackForwardListItem&) override;
1019110191
diff --git a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
10192-
index bf7dc132b1ef9e081275cbecb562dd1bfd3a2a0e..63eb41bc3e52c97b933e6bd8288f6824f71ca675 100644
10192+
index bf7dc132b1ef9e081275cbecb562dd1bfd3a2a0e..e389900c57adb50ae8802b58fd1992c01f44e8ed 100644
1019310193
--- a/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
1019410194
+++ b/Source/WebKit/UIProcess/mac/PageClientImplMac.mm
1019510195
@@ -78,6 +78,7 @@
@@ -10244,7 +10244,17 @@ index bf7dc132b1ef9e081275cbecb562dd1bfd3a2a0e..63eb41bc3e52c97b933e6bd8288f6824
1024410244
NSView *activeView = this->activeView();
1024510245
NSWindow *activeViewWindow = activeWindow();
1024610246

10247-
@@ -456,6 +473,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
10247+
@@ -278,7 +295,8 @@ void PageClientImpl::didRelaunchProcess()
10248+
10249+
void PageClientImpl::preferencesDidChange()
10250+
{
10251+
- m_impl->preferencesDidChange();
10252+
+ if (m_impl)
10253+
+ m_impl->preferencesDidChange();
10254+
}
10255+
10256+
void PageClientImpl::toolTipChanged(const String& oldToolTip, const String& newToolTip)
10257+
@@ -456,6 +474,8 @@ IntRect PageClientImpl::rootViewToAccessibilityScreen(const IntRect& rect)
1024810258

1024910259
void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent& event, bool eventWasHandled)
1025010260
{
@@ -10253,7 +10263,7 @@ index bf7dc132b1ef9e081275cbecb562dd1bfd3a2a0e..63eb41bc3e52c97b933e6bd8288f6824
1025310263
m_impl->doneWithKeyEvent(event.nativeEvent(), eventWasHandled);
1025410264
}
1025510265

10256-
@@ -760,6 +779,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR
10266+
@@ -760,6 +780,13 @@ void PageClientImpl::beganExitFullScreen(const IntRect& initialFrame, const IntR
1025710267

1025810268
#endif // ENABLE(FULLSCREEN_API)
1025910269

@@ -10267,7 +10277,7 @@ index bf7dc132b1ef9e081275cbecb562dd1bfd3a2a0e..63eb41bc3e52c97b933e6bd8288f6824
1026710277
void PageClientImpl::navigationGestureDidBegin()
1026810278
{
1026910279
m_impl->dismissContentRelativeChildWindowsWithAnimation(true);
10270-
@@ -931,6 +957,9 @@ void PageClientImpl::didRestoreScrollPosition()
10280+
@@ -931,6 +958,9 @@ void PageClientImpl::didRestoreScrollPosition()
1027110281

1027210282
bool PageClientImpl::windowIsFrontWindowUnderMouse(const NativeWebMouseEvent& event)
1027310283
{

0 commit comments

Comments
 (0)