Changeset 242410 in webkit

Timestamp:

Mar 4, 2019 8:27:58 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Reload actions from second level inspector should properly reload the inspected inspector
​https://bugs.webkit.org/show_bug.cgi?id=195306

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2019-03-04
Reviewed by Matt Baker.

• UserInterface/Base/Main.js:

Provide a better reload for a Nth level inspector.

• UserInterface/Debug/Bootstrap.js:

(WI.runBootstrapOperations):
Simplify, should not need to check for InspectorFrontendHost.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (2 diffs)
• UserInterface/Debug/Bootstrap.js (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-03-04  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Reload actions from second level inspector should properly reload the inspected inspector
+        https://bugs.webkit.org/show_bug.cgi?id=195306
+
+        Reviewed by Matt Baker.
+
+        * UserInterface/Base/Main.js:
+        Provide a better reload for a Nth level inspector.
+
+        * UserInterface/Debug/Bootstrap.js:
+        (WI.runBootstrapOperations):
+        Simplify, should not need to check for InspectorFrontendHost.
+
 2019-03-04  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -2261 +2261 @@
 };
 
+WI._reloadInspectedInspector = function()
+{
+    const options = {};
+    WI.runtimeManager.evaluateInInspectedWindow(`InspectorFrontendHost.reopen()`, options, function(){});
+};
+
 WI._reloadPage = function(event)
 {
@@ -2266 +2272 @@
         return;
 
+    event.preventDefault();
+
+    if (InspectorFrontendHost.inspectionLevel() > 1) {
+        WI._reloadInspectedInspector();
+        return;
+    }
+
     PageAgent.reload();
+};
+
+WI._reloadPageFromOrigin = function(event)
+{
+    if (!window.PageAgent)
+        return;
+
     event.preventDefault();
+
+    if (InspectorFrontendHost.inspectionLevel() > 1) {
+        WI._reloadInspectedInspector();
+        return;
+    }
+
+    PageAgent.reload.invoke({ignoreCache: true});
 };
 
 WI._reloadToolbarButtonClicked = function(event)
 {
+    if (InspectorFrontendHost.inspectionLevel() > 1) {
+        WI._reloadInspectedInspector();
+        return;
+    }
+
     // Reload page from origin if the button is clicked while the shift key is pressed down.
     PageAgent.reload.invoke({ignoreCache: this.modifierKeys.shiftKey});
-};
-
-WI._reloadPageFromOrigin = function(event)
-{
-    if (!window.PageAgent)
-        return;
-
-    PageAgent.reload.invoke({ignoreCache: true});
-    event.preventDefault();
 };
 

trunk/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js

@@ -104 +104 @@
 
     // Next Level Inspector.
-    let inspectionLevel = InspectorFrontendHost ? InspectorFrontendHost.inspectionLevel() : 1;
+    let inspectionLevel = InspectorFrontendHost.inspectionLevel();
     const inspectInspectorToolTip = WI.unlocalizedString("Open Web Inspector [%d]").format(inspectionLevel + 1);
     let inspectInspectorToolbarItem = new WI.ButtonToolbarItem("inspect-inspector", inspectInspectorToolTip);