Changeset 211104 in webkit

Timestamp:

Jan 24, 2017, 1:22:53 PM (10 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r211054. rdar://problem/28891161

Location:

branches/safari-603-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/RemoteWebInspectorProxy.cpp (modified) (1 diff)
• WebProcess/WebPage/RemoteWebInspectorUI.cpp (modified) (1 diff)

branches/safari-603-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-01-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r211054. rdar://problem/28891161
+
+    2017-01-23  Joseph Pecoraro  <pecoraro@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_hanson@apple.com>
 

branches/safari-603-branch/Source/WebKit2/UIProcess/RemoteWebInspectorProxy.cpp

@@ -130 +130 @@
 
     m_inspectorPage->process().addMessageReceiver(Messages::RemoteWebInspectorProxy::messageReceiverName(), m_inspectorPage->pageID(), *this);
+    m_inspectorPage->process().assumeReadAccessToBaseURL(WebInspectorProxy::inspectorBaseURL());
 }
 

branches/safari-603-branch/Source/WebKit2/WebProcess/WebPage/RemoteWebInspectorUI.cpp

@@ -120 +120 @@
 void RemoteWebInspectorUI::closeWindow()
 {
+    m_page.corePage()->inspectorController().setInspectorFrontendClient(nullptr);
+
     WebProcess::singleton().parentProcessConnection()->send(Messages::RemoteWebInspectorProxy::FrontendDidClose(), m_page.pageID());
 }