Changeset 257873 in webkit

Timestamp:

Mar 4, 2020 12:47:22 PM (4 years ago)

Author:

Devin Rousso

Message:

Web Inspector: the execution context picker is shown on pages with only one execution context if there are internal execution contexts
​https://bugs.webkit.org/show_bug.cgi?id=208502

Reviewed by Timothy Hatcher.

• UserInterface/Views/QuickConsole.js:

(WI.QuickConsole.prototype._updateActiveExecutionContextDisplay):
(WI.QuickConsole.prototype._handleEngineeringShowInternalExecutionContextsSettingChanged):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/QuickConsole.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2020-03-04  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: the execution context picker is shown on pages with only one execution context if there are internal execution contexts
+        https://bugs.webkit.org/show_bug.cgi?id=208502
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/QuickConsole.js:
+        (WI.QuickConsole.prototype._updateActiveExecutionContextDisplay):
+        (WI.QuickConsole.prototype._handleEngineeringShowInternalExecutionContextsSettingChanged):
+
 2020-03-04  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Views/QuickConsole.js

@@ -200 +200 @@
         }
 
-        if (WI.networkManager.frames.length === 1 && WI.networkManager.mainFrame.executionContextList.contexts.length === 1 && !WI.targetManager.workerTargets.length) {
-            toggleHidden(true);
-            return;
+        if (WI.networkManager.frames.length === 1 && !WI.targetManager.workerTargets.length) {
+            let mainFrameContexts = WI.networkManager.mainFrame.executionContextList.contexts;
+            let contextsToShow = mainFrameContexts.filter((context) => context.type !== WI.ExecutionContext.Type.Internal || WI.settings.engineeringShowInternalExecutionContexts.value);
+            if (contextsToShow.length <= 1) {
+                toggleHidden(true);
+                return;
+            }
         }
 
@@ -336 +340 @@
     _handleEngineeringShowInternalExecutionContextsSettingChanged(event)
     {
+        this._updateActiveExecutionContextDisplay();
+
         if (WI.runtimeManager.activeExecutionContext.type !== WI.ExecutionContext.Type.Internal)
             return;