Changeset 126308 in webkit

Timestamp:

Aug 22, 2012 8:54:59 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: [WebGL] Support the communication protocol from the injected script
​https://bugs.webkit.org/show_bug.cgi?id=94689

Patch by Andrey Adaikin <​aandrey@chromium.org> on 2012-08-22
Reviewed by Pavel Feldman.

Support the WebGL communication protocol from the injected script module.

• inspector/InjectedScriptWebGLModuleSource.js:

(.):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InjectedScriptWebGLModuleSource.js (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-22  Andrey Adaikin  <aandrey@chromium.org>
+
+        Web Inspector: [WebGL] Support the communication protocol from the injected script
+        https://bugs.webkit.org/show_bug.cgi?id=94689
+
+        Reviewed by Pavel Feldman.
+
+        Support the WebGL communication protocol from the injected script module.
+
+        * inspector/InjectedScriptWebGLModuleSource.js:
+        (.):
+
 2012-08-22  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/Source/WebCore/inspector/InjectedScriptWebGLModuleSource.js

@@ -140 +140 @@
 /**
  * @constructor
+ * @param {ReplayableResource} thisObject
+ * @param {string} functionName
+ * @param {Array.<ReplayableResource|*>} args
+ * @param {ReplayableResource|*} result
+ */
+function ReplayableCall(thisObject, functionName, args, result)
+{
+    this._thisObject = thisObject;
+    this._functionName = functionName;
+    this._args = args;
+    this._result = result;
+}
+
+ReplayableCall.prototype = {
+    /**
+     * @return {ReplayableResource}
+     */
+    resource: function()
+    {
+        return this._thisObject;
+    },
+
+    /**
+     * @return {string}
+     */
+    functionName: function()
+    {
+        return this._functionName;
+    },
+
+    /**
+     * @return {Array.<ReplayableResource|*>}
+     */
+    args: function()
+    {
+        return this._args;
+    },
+
+    /**
+     * @return {ReplayableResource|*}
+     */
+    result: function()
+    {
+        return this._result;
+    },
+
+    /**
+     * @param {Cache} cache
+     * @return {Call}
+     */
+    replay: function(cache)
+    {
+        // FIXME: Do the replay.
+    }
+}
+
+/**
+ * @constructor
  * @param {Object} wrappedObject
  */
@@ -222 +280 @@
     {
         object["__resourceObject"] = this;
+    }
+}
+
+/**
+ * @constructor
+ * @param {Resource} originalResource
+ * @param {Object} data
+ */
+function ReplayableResource(originalResource, data)
+{
+}
+
+ReplayableResource.prototype = {
+    /**
+     * @param {Cache} cache
+     * @return {Resource}
+     */
+    replay: function(cache)
+    {
+        // FIXME: Do the replay.
     }
 }
@@ -354 +432 @@
 function TraceLog()
 {
-    this._calls = [];
-    this._resourceCache = new Cache();
+    this._replayableCalls = [];
+    this._replayablesCache = new Cache();
 }
 
@@ -364 +442 @@
     size: function()
     {
-        return this._calls.length;
+        return this._replayableCalls.length;
+    },
+
+    /**
+     * @return {Array.<ReplayableCall>}
+     */
+    replayableCalls: function()
+    {
+        return this._replayableCalls;
     },
 
@@ -380 +466 @@
     addCall: function(call)
     {
-        // FIXME: Clone call and push the clone.
-        this._calls.push(call);
+        // FIXME: Convert the call to a ReplayableCall and push it.
+    }
+}
+
+/**
+ * @constructor
+ * @param {TraceLog} traceLog
+ */
+function TraceLogPlayer(traceLog)
+{
+    this._traceLog = traceLog;
+    this._nextReplayStep = 0;
+    this._replayWorldCache = new Cache();
+}
+
+TraceLogPlayer.prototype = {
+    /**
+     * @return {TraceLog}
+     */
+    traceLog: function()
+    {
+        return this._traceLog;
+    },
+
+    /**
+     * @return {number}
+     */
+    nextReplayStep: function()
+    {
+        return this._nextReplayStep;
+    },
+
+    reset: function()
+    {
+        // FIXME: Prevent memory leaks: detach and delete all old resources OR reuse them OR create a new replay canvas every time.
+        this._nextReplayStep = 0;
+        this._replayWorldCache.reset();
+    },
+
+    step: function()
+    {
+        this.stepTo(this._nextReplayStep);
+    },
+
+    /**
+     * @param {number} stepNum
+     */
+    stepTo: function(stepNum)
+    {
+        stepNum = Math.min(stepNum, this._traceLog.size() - 1);
+        console.assert(stepNum >= 0);
+        if (this._nextReplayStep > stepNum)
+            this.reset();
+        // FIXME: Replay all the cached resources first to warm-up.
+        var replayableCalls = this._traceLog.replayableCalls();
+        while (this._nextReplayStep <= stepNum)
+            replayableCalls[this._nextReplayStep++].replay(this._replayWorldCache);            
+    },
+
+    replay: function()
+    {
+        this.stepTo(this._traceLog.size() - 1);
     }
 }
@@ -492 +638 @@
 {
     this._manager = new ResourceTrackingManager();
+    this._lastTraceLogId = 0;
+    this._traceLogs = {};
+    this._traceLogPlayer = null;
+    this._replayContext = null;
 }
 
@@ -509 +659 @@
     captureFrame: function()
     {
+        var id = this._makeTraceLogId();
         this._manager.captureFrame();
+        this._traceLogs[id] = this._manager.lastTraceLog();
+        return id;
+    },
+
+    /**
+     * @param {string} id
+     */
+    dropTraceLog: function(id)
+    {
+        if (this._traceLogPlayer && this._traceLogPlayer.traceLog() === this._traceLogs[id])
+            this._traceLogPlayer = null;
+        delete this._traceLogs[id];
+    },
+
+    /**
+     * @param {string} id
+     * @return {Object|string}
+     */
+    traceLog: function(id)
+    {
+        var traceLog = this._traceLogs[id];
+        if (!traceLog)
+            return "Error: Trace log with this ID not found.";
+        var result = {
+            id: id,
+            calls: []
+        };
+        var calls = traceLog.replayableCalls();
+        for (var i = 0, n = calls.length; i < n; ++i) {
+            var call = calls[i];
+            result.calls.push({
+                functionName: call.functionName() + "(" + call.args().join(", ") + ") => " + call.result()
+            });
+        }
+        return result;
+    },
+
+    /**
+     * @param {string} id
+     * @param {number} stepNo
+     * @return {string}
+     */
+    replayTraceLog: function(id, stepNo)
+    {
+        var traceLog = this._traceLogs[id];
+        if (!traceLog)
+            return "";
+        if (!this._traceLogPlayer || this._traceLogPlayer.traceLog() !== traceLog)
+            this._traceLogPlayer = new TraceLogPlayer(traceLog);
+        this._traceLogPlayer.stepTo(stepNo);
+        if (!this._replayContext) {
+            console.error("ASSERT_NOT_REACHED: replayTraceLog failed to create a replay canvas?!");
+            return "";
+        }
+        // Return current screenshot.
+        return this._replayContext.canvas.toDataURL();
+    },
+
+    /**
+     * @return {string}
+     */
+    _makeTraceLogId: function()
+    {
+        return "{\"injectedScriptId\":" + injectedScriptId + ",\"traceLogId\":" + (++this._lastTraceLogId) + "}";
     }
 }