Title: [242410] trunk/Source/WebInspectorUI
- Revision
- 242410
- Author
- commit-qu...@webkit.org
- Date
- 2019-03-04 20:27:58 -0800 (Mon, 04 Mar 2019)
Log 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 <pecor...@apple.com> 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.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (242409 => 242410)
--- trunk/Source/WebInspectorUI/ChangeLog 2019-03-05 04:24:44 UTC (rev 242409)
+++ trunk/Source/WebInspectorUI/ChangeLog 2019-03-05 04:27:58 UTC (rev 242410)
@@ -1,5 +1,19 @@
2019-03-04 Joseph Pecoraro <pecor...@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 <pecor...@apple.com>
+
Web Inspector: MediaSource logging not initialized properly
https://bugs.webkit.org/show_bug.cgi?id=195307
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (242409 => 242410)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2019-03-05 04:24:44 UTC (rev 242409)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2019-03-05 04:27:58 UTC (rev 242410)
@@ -2260,19 +2260,25 @@
this.archiveMainFrame();
};
+WI._reloadInspectedInspector = function()
+{
+ const options = {};
+ WI.runtimeManager.evaluateInInspectedWindow(`InspectorFrontendHost.reopen()`, options, function(){});
+};
+
WI._reloadPage = function(event)
{
if (!window.PageAgent)
return;
- PageAgent.reload();
event.preventDefault();
-};
-WI._reloadToolbarButtonClicked = function(event)
-{
- // Reload page from origin if the button is clicked while the shift key is pressed down.
- PageAgent.reload.invoke({ignoreCache: this.modifierKeys.shiftKey});
+ if (InspectorFrontendHost.inspectionLevel() > 1) {
+ WI._reloadInspectedInspector();
+ return;
+ }
+
+ PageAgent.reload();
};
WI._reloadPageFromOrigin = function(event)
@@ -2280,10 +2286,27 @@
if (!window.PageAgent)
return;
+ event.preventDefault();
+
+ if (InspectorFrontendHost.inspectionLevel() > 1) {
+ WI._reloadInspectedInspector();
+ return;
+ }
+
PageAgent.reload.invoke({ignoreCache: true});
- event.preventDefault();
};
+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._updateReloadToolbarButton = function()
{
if (!window.PageAgent) {
Modified: trunk/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js (242409 => 242410)
--- trunk/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js 2019-03-05 04:24:44 UTC (rev 242409)
+++ trunk/Source/WebInspectorUI/UserInterface/Debug/Bootstrap.js 2019-03-05 04:27:58 UTC (rev 242410)
@@ -103,7 +103,7 @@
applyDumpMessagesState(dumpMessagesCurrentState());
// 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);
WI.toolbar.addToolbarItem(inspectInspectorToolbarItem, WI.Toolbar.Section.CenterRight);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
