Diff
Modified: trunk/Source/WebKit/ChangeLog (238616 => 238617)
--- trunk/Source/WebKit/ChangeLog 2018-11-28 17:33:05 UTC (rev 238616)
+++ trunk/Source/WebKit/ChangeLog 2018-11-28 17:51:49 UTC (rev 238617)
@@ -1,3 +1,27 @@
+2018-11-28 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: REGRESSION(r238378): reloading WebInspector after a settings change doesn't re-show WebInspector
+ https://bugs.webkit.org/show_bug.cgi?id=191971
+
+ Reviewed by Matt Baker.
+
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::reopen): Deleted.
+ * WebProcess/WebPage/WebInspector.h:
+ * WebProcess/WebPage/WebInspector.messages.in:
+ Move reopen out of the WebProcess...
+
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::reopen):
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/WebInspectorProxy.messages.in:
+ And into the UIProcess where the order of messages won't
+ be as problematic.
+
+ * WebProcess/WebPage/WebInspectorUI.cpp:
+ (WebKit::WebInspectorUI::reopen):
+ Send a message to the WebInspectorProxy instead.
+
2018-11-28 Alexey Proskuryakov <[email protected]>
Remove another OS version check from NetworkDataTaskCocoa.mm
Modified: trunk/Source/WebKit/UIProcess/WebInspectorProxy.cpp (238616 => 238617)
--- trunk/Source/WebKit/UIProcess/WebInspectorProxy.cpp 2018-11-28 17:33:05 UTC (rev 238616)
+++ trunk/Source/WebKit/UIProcess/WebInspectorProxy.cpp 2018-11-28 17:51:49 UTC (rev 238617)
@@ -171,6 +171,15 @@
platformDidCloseForCrash();
}
+void WebInspectorProxy::reopen()
+{
+ if (!m_inspectedPage)
+ return;
+
+ close();
+ show();
+}
+
void WebInspectorProxy::reset()
{
if (m_inspectedPage) {
@@ -398,6 +407,8 @@
m_inspectorPage->process().send(Messages::WebInspectorUI::EstablishConnection(m_inspectedPage->pageID(), m_underTest, inspectionLevel()), m_inspectorPage->pageID());
+ ASSERT(!m_isActiveFrontend);
+ m_isActiveFrontend = true;
m_inspectedPage->inspectorController().connectFrontend(*this);
if (!m_underTest) {
@@ -470,7 +481,10 @@
m_inspectorPage->process().send(Messages::WebInspectorUI::SetIsVisible(m_isVisible), m_inspectorPage->pageID());
m_inspectorPage->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_inspectedPage->pageID());
- m_inspectedPage->inspectorController().disconnectFrontend(*this);
+ if (m_isActiveFrontend) {
+ m_isActiveFrontend = false;
+ m_inspectedPage->inspectorController().disconnectFrontend(*this);
+ }
if (m_isAttached)
platformDetach();
Modified: trunk/Source/WebKit/UIProcess/WebInspectorProxy.h (238616 => 238617)
--- trunk/Source/WebKit/UIProcess/WebInspectorProxy.h 2018-11-28 17:33:05 UTC (rev 238616)
+++ trunk/Source/WebKit/UIProcess/WebInspectorProxy.h 2018-11-28 17:51:49 UTC (rev 238617)
@@ -100,6 +100,7 @@
void hide();
void close();
void closeForCrash();
+ void reopen();
void reset();
void updateForNewPageProcess(WebPageProxy*);
@@ -254,6 +255,7 @@
bool m_elementSelectionActive { false };
bool m_ignoreElementSelectionChange { false };
bool m_isOpening { false };
+ bool m_isActiveFrontend { false };
AttachmentSide m_attachmentSide {AttachmentSide::Bottom};
Modified: trunk/Source/WebKit/UIProcess/WebInspectorProxy.messages.in (238616 => 238617)
--- trunk/Source/WebKit/UIProcess/WebInspectorProxy.messages.in 2018-11-28 17:33:05 UTC (rev 238616)
+++ trunk/Source/WebKit/UIProcess/WebInspectorProxy.messages.in 2018-11-28 17:51:49 UTC (rev 238617)
@@ -29,6 +29,7 @@
FrontendLoaded()
DidClose()
BringToFront()
+ Reopen()
InspectedURLChanged(String urlString)
ShowCertificate(WebCore::CertificateInfo certificateInfo)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp (238616 => 238617)
--- trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp 2018-11-28 17:33:05 UTC (rev 238616)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebInspector.cpp 2018-11-28 17:51:49 UTC (rev 238617)
@@ -142,12 +142,6 @@
closeFrontendConnection();
}
-void WebInspector::reopen()
-{
- close();
- show();
-}
-
void WebInspector::openInNewTab(const String& urlString)
{
UserGestureIndicator indicator { ProcessingUserGesture };
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebInspector.h (238616 => 238617)
--- trunk/Source/WebKit/WebProcess/WebPage/WebInspector.h 2018-11-28 17:33:05 UTC (rev 238616)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebInspector.h 2018-11-28 17:51:49 UTC (rev 238617)
@@ -52,7 +52,6 @@
void show();
void close();
- void reopen();
void openInNewTab(const String& urlString);
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebInspector.messages.in (238616 => 238617)
--- trunk/Source/WebKit/WebProcess/WebPage/WebInspector.messages.in 2018-11-28 17:33:05 UTC (rev 238616)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebInspector.messages.in 2018-11-28 17:51:49 UTC (rev 238617)
@@ -23,7 +23,6 @@
messages -> WebInspector {
Show()
Close()
- Reopen()
SetAttached(bool attached)
Modified: trunk/Source/WebKit/WebProcess/WebPage/WebInspectorUI.cpp (238616 => 238617)
--- trunk/Source/WebKit/WebProcess/WebPage/WebInspectorUI.cpp 2018-11-28 17:33:05 UTC (rev 238616)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebInspectorUI.cpp 2018-11-28 17:51:49 UTC (rev 238617)
@@ -169,8 +169,7 @@
void WebInspectorUI::reopen()
{
- if (m_backendConnection)
- m_backendConnection->send(Messages::WebInspector::Reopen(), 0);
+ WebProcess::singleton().parentProcessConnection()->send(Messages::WebInspectorProxy::Reopen(), m_inspectedPageIdentifier);
}
WebCore::UserInterfaceLayoutDirection WebInspectorUI::userInterfaceLayoutDirection() const
