Changeset 136418 in webkit

Timestamp:

Dec 3, 2012, 10:59:29 AM (12 years ago)

Author:

aandrey@chromium.org

Message:

Web Inspector: [Canvas] show replay screenshot of the last call's canvas
​https://bugs.webkit.org/show_bug.cgi?id=103739

Reviewed by Pavel Feldman.

When many canvases are being instrumented we'll want to show replay screenshots for each canvas.
Meanwhile, show the screenshot of the last-touched canvas during the current replay.

• inspector/InjectedScriptCanvasModuleSource.js:

(.):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InjectedScriptCanvasModuleSource.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-03  Andrey Adaikin  <aandrey@chromium.org>
+
+        Web Inspector: [Canvas] show replay screenshot of the last call's canvas
+        https://bugs.webkit.org/show_bug.cgi?id=103739
+
+        Reviewed by Pavel Feldman.
+
+        When many canvases are being instrumented we'll want to show replay screenshots for each canvas.
+        Meanwhile, show the screenshot of the last-touched canvas during the current replay.
+
+        * inspector/InjectedScriptCanvasModuleSource.js:
+        (.):
+
 2012-12-03  Joshua Bell  <jsbell@chromium.org>
 

trunk/Source/WebCore/inspector/InjectedScriptCanvasModuleSource.js

@@ -2415 +2415 @@
     },
 
+    /**
+     * @return {Call}
+     */
     step: function()
     {
-        this.stepTo(this._nextReplayStep);
+        return this.stepTo(this._nextReplayStep);
     },
 
     /**
      * @param {number} stepNum
+     * @return {Call}
      */
     stepTo: function(stepNum)
@@ -2430 +2434 @@
             this.reset();
         // FIXME: Replay all the cached resources first to warm-up.
+        var lastCall = null;
         var replayableCalls = this._traceLog.replayableCalls();
         while (this._nextReplayStep <= stepNum)
-            replayableCalls[this._nextReplayStep++].replay(this._replayWorldCache);
-    },
-
+            lastCall = replayableCalls[this._nextReplayStep++].replay(this._replayWorldCache);
+        return lastCall;
+    },
+
+    /**
+     * @return {Call}
+     */
     replay: function()
     {
-        this.stepTo(this._traceLog.size() - 1);
+        return this.stepTo(this._traceLog.size() - 1);
     }
 }
@@ -2705 +2714 @@
             this._traceLogPlayer = new TraceLogPlayer(traceLog, this._onTraceLogPlayerReset.bind(this));
         }
-        this._traceLogPlayer.stepTo(stepNo);
+        var lastCall = this._traceLogPlayer.stepTo(stepNo);
         if (!this._replayContexts.length) {
             console.error("ASSERT_NOT_REACHED: replayTraceLog failed to create a replay canvas?!");
             return "";
         }
-        // Return current screenshot.
         // FIXME: Support replaying several canvases simultaneously.
+        var lastCallResourceContext = Resource.wrappedObject(lastCall.resource());
+        for (var i = 0, n = this._replayContexts.length; i < n; ++i) {
+            var context = this._replayContexts[i].context;
+            if (lastCallResourceContext === context)
+                return context.canvas.toDataURL();
+        }
+        console.assert("ASSERT_NOT_REACHED: replayTraceLog failed to match the replaying canvas?!");
         return this._replayContexts[0].context.canvas.toDataURL();
     },