Changeset 143324 in webkit

Timestamp:

Feb 19, 2013 6:29:47 AM (11 years ago)

Author:

aandrey@chromium.org

Message:

Web Inspector: [Canvas] UI: tweak replay control buttons behavior
​https://bugs.webkit.org/show_bug.cgi?id=110207

Reviewed by Pavel Feldman.

Source/WebCore:

New behavior for control buttons in the Canvas profiler.

• The NextCall button (~StepInto) on a node group should expand it and move into its first child (instead of expanding and moving into the next node group)
• The NextDrawCall button (~StepOver) should move to a next node that has children (instead of just iterating call group nodes, ignoring frame nodes).
• The ReplayLast button should select the last expanded node (instead of always selecting last frame group node).

• inspector/front-end/CanvasProfileView.js:

(WebInspector.CanvasProfileView.prototype._onReplayStepClick):
(WebInspector.CanvasProfileView.prototype._onReplayDrawingCallClick):
(WebInspector.CanvasProfileView.prototype._onReplayLastStepClick):

LayoutTests:

Testing control buttons behavior.

• inspector/profiler/canvas2d/canvas-replay-log-grid-expected.txt:
• inspector/profiler/canvas2d/canvas-replay-log-grid.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/profiler/canvas2d/canvas-replay-log-grid-expected.txt (modified) (1 diff)
• LayoutTests/inspector/profiler/canvas2d/canvas-replay-log-grid.html (modified) (4 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/front-end/CanvasProfileView.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-19  Andrey Adaikin  <aandrey@chromium.org>
+
+        Web Inspector: [Canvas] UI: tweak replay control buttons behavior
+        https://bugs.webkit.org/show_bug.cgi?id=110207
+
+        Reviewed by Pavel Feldman.
+
+        Testing control buttons behavior.
+
+        * inspector/profiler/canvas2d/canvas-replay-log-grid-expected.txt:
+        * inspector/profiler/canvas2d/canvas-replay-log-grid.html:
+
 2013-02-19  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/LayoutTests/inspector/profiler/canvas2d/canvas-replay-log-grid-expected.txt

@@ -2 +2 @@
 
 Bug 109592 
+
+Total frames: 2
+Total draw call groups: 5
+Total calls: 30
+Total grid nodes: 37
+
+Testing ReplayFirstStepClick
+Testing ReplayNextStepClick
+Testing ReplayPreviousStepClick
+Testing ReplayNextDrawingCallClick starting on a frame node
+Testing ReplayPreviousDrawingCallClick starting on a frame node
+Testing ReplayNextDrawingCallClick starting on a draw call group
+Testing ReplayPreviousDrawingCallClick starting on a call node
+Testing ReplayNextDrawingCallClick starting on a call node
 
    |                   Frame #1 |                                | |

trunk/LayoutTests/inspector/profiler/canvas2d/canvas-replay-log-grid.html

@@ -49 +49 @@
     profilesPanel.toggleRecordButton();
 
-    var traceLogId;
     var profileHeader;
+    var profileView;
+    var dataGrid;
+
     function didStartCapturingFrame(profilesPanel, frameId, error, traceLogId)
     {
         profileHeader = profilesPanel.getProfiles(WebInspector.CanvasProfileType.TypeId)[0];
-        traceLogId = profileHeader.traceLogId();
         profilesPanel.showProfile(profileHeader);
         InspectorTest.addSniffer(profileHeader, "_updateCapturingStatus", didReceiveFirstFrame);
@@ -69 +70 @@
     function didSecondFrameCalls()
     {
-        InspectorTest.addSniffer(profileHeader, "_updateCapturingStatus", didReceiveSecondFrame);
+        profileView = profilesPanel.visibleView;
+        dataGrid = profileView._logGrid;
+        InspectorTest.addSniffer(CanvasAgent, "replayTraceLog", onReplayTraceLog);
         profilesPanel.toggleRecordButton();
     }
-    function didReceiveSecondFrame()
-    {
-        if (profileHeader._alive) {
-            InspectorTest.addSniffer(profileHeader, "_updateCapturingStatus", didReceiveSecondFrame);
-            return;
-        }
-
-        var profileView = profilesPanel.visibleView;
-        var dataGrid = profileView._logGrid;
-        dataGrid.rootNode().expandRecursively();
-
+    function onReplayTraceLog(traceLogId, index)
+    {
+        testControlButtons();
+
+        InspectorTest.addResult("");
         dumpTableData(dataGrid.element);
         InspectorTest.completeTest();
     }
+
+
+    function testControlButtons()
+    {
+        var rootNode = dataGrid.rootNode();
+        var frameNodes = [];
+        var drawCallGroups = [];
+        var nodes = [];
+        var allNodesFlat = [];
+
+        frameNodes = frameNodes.concat(rootNode.children);
+        frameNodes.forEach(function(frameNode) {
+            drawCallGroups = drawCallGroups.concat(frameNode.children);
+        });
+        drawCallGroups.forEach(function(drawCallGroup) {
+            nodes = nodes.concat(drawCallGroup.children);
+        });
+        for (var node = rootNode; node; node = node.traverseNextNode(false)) {
+            if (node !== rootNode)
+                allNodesFlat.push(node);
+        }
+        allNodesFlat.forEach(function(node) {
+            node.toString = function()
+            {
+                return "Node{" + this.element.textContent + "}";
+            }
+        });
+
+        InspectorTest.addResult("");
+        InspectorTest.addResult("Total frames: " + frameNodes.length);
+        InspectorTest.addResult("Total draw call groups: " + drawCallGroups.length);
+        InspectorTest.addResult("Total calls: " + nodes.length);
+        InspectorTest.addResult("Total grid nodes: " + allNodesFlat.length);
+        InspectorTest.addResult("");
+
+        InspectorTest.assertEquals(frameNodes.peekLast(), dataGrid.selectedNode, "Expected last frame node before testing control buttons");
+
+        InspectorTest.addResult("Testing ReplayFirstStepClick");
+        profileView._onReplayFirstStepClick();
+        InspectorTest.assertEquals(frameNodes[0], dataGrid.selectedNode);
+
+        InspectorTest.addResult("Testing ReplayNextStepClick");
+        for (var i = 1; i < allNodesFlat.length + 5; ++i) {
+            profileView._onReplayStepClick(true);
+            InspectorTest.assertEquals(allNodesFlat[i] || allNodesFlat.peekLast(), dataGrid.selectedNode, "error on index " + i);
+        }
+
+        InspectorTest.addResult("Testing ReplayPreviousStepClick");
+        for (var i = allNodesFlat.length - 2; i >= -5; --i) {
+            profileView._onReplayStepClick(false);
+            InspectorTest.assertEquals(allNodesFlat[i] || allNodesFlat[0], dataGrid.selectedNode, "error on index " + i);
+        }
+
+        InspectorTest.addResult("Testing ReplayNextDrawingCallClick starting on a frame node");
+        for (var i = 1; i < frameNodes.length + 5; ++i) {
+            profileView._onReplayDrawingCallClick(true);
+            InspectorTest.assertEquals(frameNodes[i] || frameNodes.peekLast(), dataGrid.selectedNode, "error on index " + i);
+        }
+
+        InspectorTest.addResult("Testing ReplayPreviousDrawingCallClick starting on a frame node");
+        for (var i = frameNodes.length - 2; i >= -5; --i) {
+            profileView._onReplayDrawingCallClick(false);
+            InspectorTest.assertEquals(frameNodes[i] || frameNodes[0], dataGrid.selectedNode, "error on index " + i);
+        }
+
+        profileView._onReplayStepClick(true);
+        InspectorTest.assertEquals(drawCallGroups[0], dataGrid.selectedNode, "Expected to move to the first draw call group");
+
+        InspectorTest.addResult("Testing ReplayNextDrawingCallClick starting on a draw call group");
+        var expected = [drawCallGroups[1], frameNodes[1]];
+        for (var i = 0; i < expected.length + 5; ++i) {
+            profileView._onReplayDrawingCallClick(true);
+            InspectorTest.assertEquals(expected[i] || expected.peekLast(), dataGrid.selectedNode, "error on index " + i);
+        }
+
+        profileView._onReplayLastStepClick();
+        InspectorTest.assertEquals(allNodesFlat.peekLast(), dataGrid.selectedNode, "Expected to move to the last call");
+
+        InspectorTest.addResult("Testing ReplayPreviousDrawingCallClick starting on a call node");
+        var expected = [frameNodes[0], frameNodes[1], drawCallGroups[2], drawCallGroups[3], drawCallGroups[4]];
+        for (var i = expected.length - 1; i >= -5; --i) {
+            profileView._onReplayDrawingCallClick(false);
+            InspectorTest.assertEquals(expected[i] || expected[0], dataGrid.selectedNode, "error on index " + i);
+        }
+
+        nodes[15].revealAndSelect();
+        InspectorTest.assertEquals(nodes[15], dataGrid.selectedNode, "Expected to select node #20");
+
+        InspectorTest.addResult("Testing ReplayNextDrawingCallClick starting on a call node");
+        var expected = [drawCallGroups[3], drawCallGroups[4]];
+        for (var i = 0; i < expected.length + 5; ++i) {
+            profileView._onReplayDrawingCallClick(true);
+            InspectorTest.assertEquals(expected[i] || expected.peekLast(), dataGrid.selectedNode, "error on index " + i);
+        }
+    }
+
     function dumpTableData(tableElement)
     {
@@ -104 +197 @@
                 textCols[index] = text;
             }
-            textRows.push(textCols);
+            if (textCols.length)
+                textRows.push(textCols);
         }
 
@@ -124 +218 @@
                 line += alignText(textRows[i][j], textWidths[j]);
             }
-            if (line)
-                line += "|";
+            line += "|";
             InspectorTest.addResult(line);
         }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-19  Andrey Adaikin  <aandrey@chromium.org>
+
+        Web Inspector: [Canvas] UI: tweak replay control buttons behavior
+        https://bugs.webkit.org/show_bug.cgi?id=110207
+
+        Reviewed by Pavel Feldman.
+
+        New behavior for control buttons in the Canvas profiler.
+        - The NextCall button (~StepInto) on a node group should expand it and move into its first child (instead of expanding and moving into the next node group)
+        - The NextDrawCall button (~StepOver) should move to a next node that has children (instead of just iterating call group nodes, ignoring frame nodes).
+        - The ReplayLast button should select the last expanded node (instead of always selecting last frame group node).
+
+        * inspector/front-end/CanvasProfileView.js:
+        (WebInspector.CanvasProfileView.prototype._onReplayStepClick):
+        (WebInspector.CanvasProfileView.prototype._onReplayDrawingCallClick):
+        (WebInspector.CanvasProfileView.prototype._onReplayLastStepClick):
+
 2013-02-19  Andrei Bucur  <abucur@adobe.com>
 

trunk/Source/WebCore/inspector/front-end/CanvasProfileView.js

@@ -182 +182 @@
     _onReplayStepClick: function(forward)
     {
-        var index = this._selectedCallIndex();
-        if (index === -1)
-            return;
-        var nextNode = this._logGridNodes[forward ? index + 1 : index - 1] || this._logGridNodes[index];
-        nextNode.revealAndSelect();
+        var selectedNode = this._logGrid.selectedNode;
+        if (!selectedNode)
+            return;
+        var nextNode = forward ? selectedNode.traverseNextNode(false) : selectedNode.traversePreviousNode(false);
+        (nextNode || selectedNode).revealAndSelect();
     },
 
@@ -194 +194 @@
     _onReplayDrawingCallClick: function(forward)
     {
-        var index = this._selectedDrawCallGroupIndex();
-        if (index === -1)
-            return;
-        var nextNode = this._drawCallGroups[forward ? index + 1 : index - 1] || this._drawCallGroups[index];
-        nextNode.revealAndSelect();
+        var selectedNode = this._logGrid.selectedNode;
+        if (!selectedNode)
+            return;
+        var nextNode = selectedNode;
+        while (nextNode) {
+            var sibling = forward ? nextNode.nextSibling : nextNode.previousSibling;
+            if (sibling) {
+                nextNode = sibling;
+                if (nextNode.hasChildren)
+                    break;
+            } else {
+                nextNode = nextNode.parent;
+                if (!forward)
+                    break;
+            }
+        }
+        (nextNode || selectedNode).revealAndSelect();
     },
 
@@ -211 +223 @@
     {
         var lastNode = this._logGrid.rootNode().children.peekLast();
-        if (lastNode)
-            lastNode.revealAndSelect();
+        if (!lastNode)
+            return;
+        while (lastNode.expanded) {
+            var lastChild = lastNode.children.peekLast();
+            if (!lastChild)
+                break;
+            lastNode = lastChild;
+        }
+        lastNode.revealAndSelect();
     },