Title: [211104] branches/safari-603-branch/Source/WebKit2
- Revision
- 211104
- Author
- matthew_han...@apple.com
- Date
- 2017-01-24 13:22:53 -0800 (Tue, 24 Jan 2017)
Log Message
Merge r211054. rdar://problem/28891161
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (211103 => 211104)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-24 21:22:50 UTC (rev 211103)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-24 21:22:53 UTC (rev 211104)
@@ -1,5 +1,25 @@
2017-01-24 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211054. rdar://problem/28891161
+
+ 2017-01-23 Joseph Pecoraro <pecor...@apple.com>
+
+ Web Inspector: Asserts seen opening and closing Remote Web Inspector windows
+ https://bugs.webkit.org/show_bug.cgi?id=167316
+ <rdar://problem/28891161>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * UIProcess/RemoteWebInspectorProxy.cpp:
+ (WebKit::RemoteWebInspectorProxy::createFrontendPageAndWindow):
+ Assume read access, like the local web inspector, to Web Inspector resources.
+
+ * WebProcess/WebPage/RemoteWebInspectorUI.cpp:
+ (WebKit::RemoteWebInspectorUI::closeWindow):
+ Clear ourselves as the inspector frontend client when closing.
+
+2017-01-24 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211045. rdar://problem/29486368
2017-01-23 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/UIProcess/RemoteWebInspectorProxy.cpp (211103 => 211104)
--- branches/safari-603-branch/Source/WebKit2/UIProcess/RemoteWebInspectorProxy.cpp 2017-01-24 21:22:50 UTC (rev 211103)
+++ branches/safari-603-branch/Source/WebKit2/UIProcess/RemoteWebInspectorProxy.cpp 2017-01-24 21:22:53 UTC (rev 211104)
@@ -129,6 +129,7 @@
trackInspectorPage(m_inspectorPage);
m_inspectorPage->process().addMessageReceiver(Messages::RemoteWebInspectorProxy::messageReceiverName(), m_inspectorPage->pageID(), *this);
+ m_inspectorPage->process().assumeReadAccessToBaseURL(WebInspectorProxy::inspectorBaseURL());
}
void RemoteWebInspectorProxy::closeFrontendPageAndWindow()
Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/RemoteWebInspectorUI.cpp (211103 => 211104)
--- branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/RemoteWebInspectorUI.cpp 2017-01-24 21:22:50 UTC (rev 211103)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/RemoteWebInspectorUI.cpp 2017-01-24 21:22:53 UTC (rev 211104)
@@ -119,6 +119,8 @@
void RemoteWebInspectorUI::closeWindow()
{
+ m_page.corePage()->inspectorController().setInspectorFrontendClient(nullptr);
+
WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::FrontendDidClose(), m_page.pageID());
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
