Changeset 253421 in webkit

Timestamp:

Dec 12, 2019 12:24:24 AM (4 years ago)

Author:

Devin Rousso

Message:

Web Inspector: REGRESSION(r251227): Uncaught Exception: undefined is not an object (evaluating 'target.DOMAgent.setInspectModeEnabled')
​https://bugs.webkit.org/show_bug.cgi?id=205148

Reviewed by Joseph Pecoraro.

• UserInterface/Protocol/InspectorFrontendAPI.js:

(InspectorFrontendAPI.setTimelineProfilingEnabled):
(InspectorFrontendAPI.setElementSelectionEnabled):
If there are no targets available yet (WI.targetsAvailable()), then wait for targets to
be available (WI.whenTargetsAvailable()) before performing the intended logic, as the
InspectorFrontendAPI only waits for the backend connection to be established before
dispatching, meaning that there may not be a page target yet. Other InspectorFrontendAPI
functions don't need to be changed because they don't cause commands to be invoked.

• UserInterface/Controllers/DOMManager.js:

(WI.DOMManager.prototype.set inspectModeEnabled):
Drive-by: don't assume that inspect mode is disabled if an error is thrown.

• UserInterface/Base/Main.js:

Drive-by: remove duplicate function WI._toggleInspectMode as it already exists.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)
• UserInterface/Controllers/DOMManager.js (modified) (1 diff)
• UserInterface/Protocol/InspectorFrontendAPI.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-12-12  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: REGRESSION(r251227): Uncaught Exception: undefined is not an object (evaluating 'target.DOMAgent.setInspectModeEnabled')
+        https://bugs.webkit.org/show_bug.cgi?id=205148
+
+        Reviewed by Joseph Pecoraro.
+
+        * UserInterface/Protocol/InspectorFrontendAPI.js:
+        (InspectorFrontendAPI.setTimelineProfilingEnabled):
+        (InspectorFrontendAPI.setElementSelectionEnabled):
+        If there are no targets available yet (`WI.targetsAvailable()`), then wait for targets to
+        be available (`WI.whenTargetsAvailable()`) before performing the intended logic, as the
+        `InspectorFrontendAPI` only waits for the backend connection to be established before
+        dispatching, meaning that there may not be a page target yet. Other `InspectorFrontendAPI`
+        functions don't need to be changed because they don't cause commands to be invoked.
+
+        * UserInterface/Controllers/DOMManager.js:
+        (WI.DOMManager.prototype.set inspectModeEnabled):
+        Drive-by: don't assume that inspect mode is disabled if an error is thrown.
+
+        * UserInterface/Base/Main.js:
+        Drive-by: remove duplicate function `WI._toggleInspectMode` as it already exists.
+
 2019-12-11  Devin Rousso  <drousso@apple.com>
 

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

@@ -2323 +2323 @@
 };
 
-WI._toggleInspectMode = function(event)
-{
-    WI.domManager.inspectModeEnabled = !WI.domManager.inspectModeEnabled;
-};
-
 WI._showConsoleTab = function(event)
 {

trunk/Source/WebInspectorUI/UserInterface/Controllers/DOMManager.js

@@ -588 +588 @@
         };
         target.DOMAgent.setInspectModeEnabled.invoke(commandArguments, (error) => {
-            this._inspectModeEnabled = error ? false : enabled;
+            if (error) {
+                WI.reportInternalError(error);
+                return;
+            }
+
+            this._inspectModeEnabled = enabled;
             this.dispatchEventToListeners(WI.DOMManager.Event.InspectModeStateChanged);
         });

trunk/Source/WebInspectorUI/UserInterface/Protocol/InspectorFrontendAPI.js

@@ -45 +45 @@
     setTimelineProfilingEnabled: function(enabled)
     {
+        if (!WI.targetsAvailable()) {
+            WI.whenTargetsAvailable().then(() => {
+                InspectorFrontendAPI.setTimelineProfilingEnabled(enabled);
+            });
+            return;
+        }
+
         WI.showTimelineTab();
 
@@ -58 +65 @@
     setElementSelectionEnabled: function(enabled)
     {
+        if (!WI.targetsAvailable()) {
+            WI.whenTargetsAvailable().then(() => {
+                InspectorFrontendAPI.setElementSelectionEnabled(enabled);
+            });
+            return;
+        }
+
         WI.domManager.inspectModeEnabled = enabled;
     },