Title: [239697] trunk/Source/WebKit
- Revision
- 239697
- Author
- [email protected]
- Date
- 2019-01-07 14:13:28 -0800 (Mon, 07 Jan 2019)
Log Message
Web Inspector: Remote inspector can crash if attempting to navigate inspector page
https://bugs.webkit.org/show_bug.cgi?id=193204
<rdar://problem/45550428>
Patch by Joseph Pecoraro <[email protected]> on 2019-01-07
Reviewed by Devin Rousso.
* UIProcess/mac/RemoteWebInspectorProxyMac.mm:
(WebKit::RemoteWebInspectorProxy::platformCreateFrontendPageAndWindow):
* UIProcess/mac/WKInspectorViewController.mm:
(-[WKInspectorViewController webView:decidePolicyForNavigationAction:decisionHandler:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (239696 => 239697)
--- trunk/Source/WebKit/ChangeLog 2019-01-07 22:05:03 UTC (rev 239696)
+++ trunk/Source/WebKit/ChangeLog 2019-01-07 22:13:28 UTC (rev 239697)
@@ -1,3 +1,16 @@
+2019-01-07 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Remote inspector can crash if attempting to navigate inspector page
+ https://bugs.webkit.org/show_bug.cgi?id=193204
+ <rdar://problem/45550428>
+
+ Reviewed by Devin Rousso.
+
+ * UIProcess/mac/RemoteWebInspectorProxyMac.mm:
+ (WebKit::RemoteWebInspectorProxy::platformCreateFrontendPageAndWindow):
+ * UIProcess/mac/WKInspectorViewController.mm:
+ (-[WKInspectorViewController webView:decidePolicyForNavigationAction:decisionHandler:]):
+
2019-01-07 Eric Carlson <[email protected]>
Deactivate audio session whenever possible
Modified: trunk/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm (239696 => 239697)
--- trunk/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm 2019-01-07 22:05:03 UTC (rev 239696)
+++ trunk/Source/WebKit/UIProcess/mac/RemoteWebInspectorProxyMac.mm 2019-01-07 22:13:28 UTC (rev 239697)
@@ -85,7 +85,7 @@
{
m_objCAdapter = adoptNS([[WKRemoteWebInspectorProxyObjCAdapter alloc] initWithRemoteWebInspectorProxy:this]);
- m_inspectorView = adoptNS([[WKInspectorViewController alloc] initWithInspectedPage:nil]);
+ m_inspectorView = adoptNS([[WKInspectorViewController alloc] initWithInspectedPage:nullptr]);
[m_inspectorView.get() setDelegate:m_objCAdapter.get()];
m_window = WebInspectorProxy::createFrontendWindow(NSZeroRect);
Modified: trunk/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm (239696 => 239697)
--- trunk/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm 2019-01-07 22:05:03 UTC (rev 239696)
+++ trunk/Source/WebKit/UIProcess/mac/WKInspectorViewController.mm 2019-01-07 22:13:28 UTC (rev 239697)
@@ -226,7 +226,8 @@
decisionHandler(WKNavigationActionPolicyCancel);
// And instead load it in the inspected page.
- _inspectedPage->loadRequest(navigationAction.request);
+ if (_inspectedPage)
+ _inspectedPage->loadRequest(navigationAction.request);
}
// MARK: WKInspectorWKWebViewDelegate methods
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
