Changeset 222124 in webkit

Timestamp:

Sep 15, 2017 7:12:17 PM (7 years ago)

Author:

webkit@devinrousso.com

Message:

Web Inspector: REGRESSION(r222057): recording state doesn't update when changing actions
​https://bugs.webkit.org/show_bug.cgi?id=176988

Reviewed by Matt Baker.

Replace updateActionIndex with updateAction, where the currently selected RecordingAction
is passed to the DetailsSidebarPanel. Also remove the call to this._recording.actions in
order to ensure that all logic performed by both DetailsSidebarPanel is synchronous.

• Localizations/en.lproj/localizedStrings.js:

• UserInterface/Views/RecordingTabContentView.js:

(WI.RecordingTabContentView.prototype._updateActionIndex):

• UserInterface/Views/RecordingContentView.js:

(WI.RecordingContentView.prototype.async._generateContentCanvas2D):
(WI.RecordingContentView.prototype.async._generateContentCanvasWebGL):

• UserInterface/Views/RecordingStateDetailsSidebarPanel.js:

(WI.RecordingStateDetailsSidebarPanel):
(WI.RecordingStateDetailsSidebarPanel.prototype.set recording):
(WI.RecordingStateDetailsSidebarPanel.prototype.updateAction):
(WI.RecordingStateDetailsSidebarPanel.prototype._generateDetailsCanvas2D):
(WI.RecordingStateDetailsSidebarPanel.prototype.updateActionIndex): Deleted.

• UserInterface/Views/RecordingTraceDetailsSidebarPanel.js:

(WI.RecordingTraceDetailsSidebarPanel):
(WI.RecordingTraceDetailsSidebarPanel.prototype.set recording):
(WI.RecordingTraceDetailsSidebarPanel.prototype.updateAction):
(WI.RecordingTraceDetailsSidebarPanel.prototype.updateActionIndex): Deleted.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• Localizations/en.lproj/localizedStrings.js (modified) (2 diffs)
• UserInterface/Views/RecordingContentView.js (modified) (2 diffs)
• UserInterface/Views/RecordingStateDetailsSidebarPanel.js (modified) (4 diffs)
• UserInterface/Views/RecordingTabContentView.js (modified) (1 diff)
• UserInterface/Views/RecordingTraceDetailsSidebarPanel.js (modified) (2 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2017-09-15  Devin Rousso  <webkit@devinrousso.com>
+
+        Web Inspector: REGRESSION(r222057): recording state doesn't update when changing actions
+        https://bugs.webkit.org/show_bug.cgi?id=176988
+
+        Reviewed by Matt Baker.
+
+        Replace `updateActionIndex` with `updateAction`, where the currently selected RecordingAction
+        is passed to the DetailsSidebarPanel. Also remove the call to `this._recording.actions` in
+        order to ensure that all logic performed by both DetailsSidebarPanel is synchronous.
+
+        * Localizations/en.lproj/localizedStrings.js:
+
+        * UserInterface/Views/RecordingTabContentView.js:
+        (WI.RecordingTabContentView.prototype._updateActionIndex):
+
+        * UserInterface/Views/RecordingContentView.js:
+        (WI.RecordingContentView.prototype.async._generateContentCanvas2D):
+        (WI.RecordingContentView.prototype.async._generateContentCanvasWebGL):
+
+        * UserInterface/Views/RecordingStateDetailsSidebarPanel.js:
+        (WI.RecordingStateDetailsSidebarPanel):
+        (WI.RecordingStateDetailsSidebarPanel.prototype.set recording):
+        (WI.RecordingStateDetailsSidebarPanel.prototype.updateAction):
+        (WI.RecordingStateDetailsSidebarPanel.prototype._generateDetailsCanvas2D):
+        (WI.RecordingStateDetailsSidebarPanel.prototype.updateActionIndex): Deleted.
+
+        * UserInterface/Views/RecordingTraceDetailsSidebarPanel.js:
+        (WI.RecordingTraceDetailsSidebarPanel):
+        (WI.RecordingTraceDetailsSidebarPanel.prototype.set recording):
+        (WI.RecordingTraceDetailsSidebarPanel.prototype.updateAction):
+        (WI.RecordingTraceDetailsSidebarPanel.prototype.updateActionIndex): Deleted.
+
 2017-09-15  Matt Baker  <mattbaker@apple.com>
 

trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js

@@ -147 +147 @@
 localizedStrings["Call Frames Truncated"] = "Call Frames Truncated";
 localizedStrings["Call Stack"] = "Call Stack";
+localizedStrings["Call Stack Unavailable"] = "Call Stack Unavailable";
 localizedStrings["Call Trees"] = "Call Trees";
 localizedStrings["Calls"] = "Calls";
@@ -595 +596 @@
 localizedStrings["No Results Found"] = "No Results Found";
 localizedStrings["No Search Results"] = "No Search Results";
-localizedStrings["No Trace Data"] = "No Trace Data";
 localizedStrings["No Watch Expressions"] = "No Watch Expressions";
 localizedStrings["No matching ARIA role"] = "No matching ARIA role";

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

@@ -399 +399 @@
         applyActions(snapshot.index, this._index, () => {
             if (options.actionCompletedCallback)
-                options.actionCompletedCallback(snapshot.context);
+                options.actionCompletedCallback(actions[this._index], snapshot.context);
         });
 
@@ -449 +449 @@
 
         if (options.actionCompletedCallback)
-            options.actionCompletedCallback();
+            options.actionCompletedCallback(actions[this._index]);
     }
 

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

@@ -31 +31 @@
 
         this._recording = null;
-        this._index = NaN;
+        this._action = null;
 
         this._dataGrid = null;
@@ -61 +61 @@
 
         this._recording = recording;
-        this._index = NaN;
+        this._action = null;
 
         for (let subview of this.contentView.subviews)
@@ -67 +67 @@
     }
 
-    updateActionIndex(index, context, options = {})
+    updateAction(action, context, options = {})
     {
-        if (!this._recording)
+        if (!this._recording || action === this._action)
             return;
 
-        this._recording.actions.then((actions) => {
-            console.assert(index >= 0 && index < actions.length);
-            if (index < 0 || index > actions.length || index === this._index)
-                return;
+        this._action = action;
 
-            this._index = index;
+        if (this._recording.type === WI.Recording.Type.Canvas2D)
+            this._generateDetailsCanvas2D(action, context, options);
 
-            if (this._recording.type === WI.Recording.Type.Canvas2D)
-                this._generateDetailsCanvas2D(context, actions, options);
-
-            this.updateLayoutIfNeeded();
-        });
+        this.updateLayoutIfNeeded();
     }
 
     // Private
 
-    _generateDetailsCanvas2D(context, actions, options = {})
+    _generateDetailsCanvas2D(action, context, options = {})
     {
         if (!this._dataGrid) {
@@ -149 +143 @@
         }
 
-        let action = actions[this._index];
         for (let name in state) {
             let value = state[name];

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

@@ -133 +133 @@
         this._scrubberNavigationItem.value = index;
 
-        options.actionCompletedCallback = (context) => {
+        options.actionCompletedCallback = (action, context) => {
             for (let detailsSidebarPanel of this.detailsSidebarPanels) {
-                if (detailsSidebarPanel.updateActionIndex)
-                    detailsSidebarPanel.updateActionIndex(index, context, options);
+                if (detailsSidebarPanel.updateAction)
+                    detailsSidebarPanel.updateAction(action, context, options);
             }
         };

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

@@ -31 +31 @@
 
         this._recording = null;
-        this._index = NaN;
+        this._action = null;
     }
 
@@ -59 +59 @@
 
         this._recording = recording;
-        this._index = NaN;
+        this._action = null;
 
         this.contentView.element.removeChildren();
     }
 
-    updateActionIndex(index, context, options = {})
+    updateAction(action, context, options = {})
     {
-        if (!this._recording)
+        if (!this._recording || action === this._action)
             return;
 
-        this._recording.actions.then((actions) => {
-            console.assert(index >= 0 && index < actions.length);
-            if (index < 0 || index > actions.length || index === this._index)
-                return;
+        this._action = action;
 
-            this._index = index;
+        this.contentView.element.removeChildren();
 
-            this.contentView.element.removeChildren();
+        let trace = this._action.trace;
+        if (!trace.length) {
+            let noTraceDataElement = this.contentView.element.appendChild(document.createElement("div"));
+            noTraceDataElement.classList.add("no-trace-data");
 
-            let trace = actions[this._index].trace;
-            if (!trace.length) {
-                let noTraceDataElement = this.contentView.element.appendChild(document.createElement("div"));
-                noTraceDataElement.classList.add("no-trace-data");
+            let noTraceDataMessageElement = noTraceDataElement.appendChild(document.createElement("div"));
+            noTraceDataMessageElement.classList.add("message");
+            noTraceDataMessageElement.textContent = WI.UIString("Call Stack Unavailable");
+            return;
+        }
 
-                let noTraceDataMessageElement = noTraceDataElement.appendChild(document.createElement("div"));
-                noTraceDataMessageElement.classList.add("message");
-                noTraceDataMessageElement.textContent = WI.UIString("No Trace Data");
-                return;
-            }
-
-            const showFunctionName = true;
-            for (let callFrame of trace)
-                this.contentView.element.appendChild(new WI.CallFrameView(callFrame, showFunctionName));
-        });
+        const showFunctionName = true;
+        for (let callFrame of trace)
+            this.contentView.element.appendChild(new WI.CallFrameView(callFrame, showFunctionName));
     }
 };