Title: [231162] branches/safari-605-branch/Source/WebKit
- Revision
- 231162
- Author
- [email protected]
- Date
- 2018-04-30 12:14:18 -0700 (Mon, 30 Apr 2018)
Log Message
Cherry-pick r230903. rdar://problem/39766220
Web Inspector: WebInspectorProxy releases WKWebInspectorProxyObjCAdapter without removing corresponding observer
https://bugs.webkit.org/show_bug.cgi?id=184865
<rdar://problem/37764960>
Reviewed by Brian Burg.
Replace the early return removed in https://bugs.webkit.org/show_bug.cgi?id=177661,
so that WKWebInspectorProxyObjCAdapter and the view controller can be reused
when reopening the Inspector while the WebView is still alive.
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::platformCreateFrontendPage):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230903 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (231161 => 231162)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-04-30 19:13:33 UTC (rev 231161)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-04-30 19:14:18 UTC (rev 231162)
@@ -1,3 +1,38 @@
+2018-04-27 Jason Marcell <[email protected]>
+
+ Cherry-pick r230903. rdar://problem/39766220
+
+ Web Inspector: WebInspectorProxy releases WKWebInspectorProxyObjCAdapter without removing corresponding observer
+ https://bugs.webkit.org/show_bug.cgi?id=184865
+ <rdar://problem/37764960>
+
+ Reviewed by Brian Burg.
+
+ Replace the early return removed in https://bugs.webkit.org/show_bug.cgi?id=177661,
+ so that WKWebInspectorProxyObjCAdapter and the view controller can be reused
+ when reopening the Inspector while the WebView is still alive.
+
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::platformCreateFrontendPage):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@230903 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-04-22 Matt Baker <[email protected]>
+
+ Web Inspector: WebInspectorProxy releases WKWebInspectorProxyObjCAdapter without removing corresponding observer
+ https://bugs.webkit.org/show_bug.cgi?id=184865
+ <rdar://problem/37764960>
+
+ Reviewed by Brian Burg.
+
+ Replace the early return removed in https://bugs.webkit.org/show_bug.cgi?id=177661,
+ so that WKWebInspectorProxyObjCAdapter and the view controller can be reused
+ when reopening the Inspector while the WebView is still alive.
+
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::platformCreateFrontendPage):
+
2018-04-26 Jason Marcell <[email protected]>
Apply patch. rdar://problem/39532926
Modified: branches/safari-605-branch/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm (231161 => 231162)
--- branches/safari-605-branch/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm 2018-04-30 19:13:33 UTC (rev 231161)
+++ branches/safari-605-branch/Source/WebKit/UIProcess/mac/WebInspectorProxyMac.mm 2018-04-30 19:14:18 UTC (rev 231162)
@@ -216,6 +216,11 @@
m_closeFrontendAfterInactivityTimer.stop();
+ if (m_inspectorViewController) {
+ ASSERT(m_objCAdapter);
+ return [m_inspectorViewController webView]->_page.get();
+ }
+
m_objCAdapter = adoptNS([[WKWebInspectorProxyObjCAdapter alloc] initWithWebInspectorProxy:this]);
NSView *inspectedView = inspectedPage()->inspectorAttachmentView();
[[NSNotificationCenter defaultCenter] addObserver:m_objCAdapter.get() selector:@selector(inspectedViewFrameDidChange:) name:NSViewFrameDidChangeNotification object:inspectedView];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
