[webkit-changes] [139729] trunk

Tue, 15 Jan 2013 01:44:54 -0800

Title: [139729] trunk
Revision
139729
Author
aand...@chromium.org
Date
2013-01-15 01:46:29 -0800 (Tue, 15 Jan 2013)

Log Message

Web Inspector: [Canvas] introduce CallArgument type into the protocol
https://bugs.webkit.org/show_bug.cgi?id=106640

Reviewed by Yury Semikhatsky.

Source/WebCore:

CallArgument type abstraction to describe arguments of a canvas context call.
Drive-by: Introduce a CanvasContext to fix the wrong contextId value in the protocol.
The contextId should point to the Resource that represents a context (2D or 3D canvas).

* inspector/InjectedScriptCanvasModuleSource.js:
(.):
* inspector/Inspector.json:
* inspector/front-end/CanvasProfileView.js:

LayoutTests:

Replaced hacky stub with actual Cache implementation.

* inspector/profiler/webgl/webgl-profiler-get-error.html:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (139728 => 139729)


--- trunk/LayoutTests/ChangeLog	2013-01-15 09:42:25 UTC (rev 139728)
+++ trunk/LayoutTests/ChangeLog	2013-01-15 09:46:29 UTC (rev 139729)
@@ -1,3 +1,14 @@
+2013-01-15  Andrey Adaikin  <aand...@chromium.org>
+
+        Web Inspector: [Canvas] introduce CallArgument type into the protocol
+        https://bugs.webkit.org/show_bug.cgi?id=106640
+
+        Reviewed by Yury Semikhatsky.
+
+        Replaced hacky stub with actual Cache implementation.
+
+        * inspector/profiler/webgl/webgl-profiler-get-error.html:
+
 2013-01-14  Dominic Cooney   <domin...@chromium.org>
 
         [Chromium] Unreviewed gardening.

Modified: trunk/LayoutTests/inspector/profiler/webgl/webgl-profiler-get-error.html (139728 => 139729)


--- trunk/LayoutTests/inspector/profiler/webgl/webgl-profiler-get-error.html	2013-01-15 09:42:25 UTC (rev 139728)
+++ trunk/LayoutTests/inspector/profiler/webgl/webgl-profiler-get-error.html	2013-01-15 09:46:29 UTC (rev 139729)
@@ -4,6 +4,61 @@
     <script src=""
 <script>
 
+/**
+ * @constructor
+ */
+function Cache()
+{
+    this.reset();
+}
+
+Cache.prototype = {
+    /**
+     * @return {number}
+     */
+    size: function()
+    {
+        return this._size;
+    },
+
+    reset: function()
+    {
+        /** @type {!Object.<number, Object>} */
+        this._items = Object.create(null);
+        /** @type {number} */
+        this._size = 0;
+    },
+
+    /**
+     * @param {number} key
+     * @return {boolean}
+     */
+    has: function(key)
+    {
+        return key in this._items;
+    },
+
+    /**
+     * @param {number} key
+     * @return {Object}
+     */
+    get: function(key)
+    {
+        return this._items[key];
+    },
+
+    /**
+     * @param {number} key
+     * @param {Object} item
+     */
+    put: function(key, item)
+    {
+        if (!this.has(key))
+            ++this._size;
+        this._items[key] = item;
+    }
+}
+
 var gl;
 var rawGL;
 var glResource;
@@ -83,11 +138,7 @@
     // 4) Check that proxy still has the original errors saved
     var errors = [rawGL.INVALID_ENUM, rawGL.INVALID_VALUE, rawGL.INVALID_OPERATION];
     errors.forEach(generateWebGLError.bind(this, rawGL));
-    var cache = {
-        put: function() {},
-        get: function() {}
-    };
-    glResource.toReplayable(cache);
+    glResource.toReplayable(new Cache());
     assertNoErrors(rawGL);
     assertEqualArrays(errors, getAllErrors(gl));
     assertNoErrors(gl);
@@ -96,11 +147,7 @@
     // 2) Check proxy and RAW errors interleaved
     var errors = [rawGL.INVALID_ENUM, rawGL.INVALID_VALUE, rawGL.INVALID_OPERATION];
     errors.forEach(generateWebGLError.bind(this, rawGL));
-    var cache = {
-        put: function() {},
-        get: function() {}
-    };
-    glResource.toReplayable(cache);
+    glResource.toReplayable(new Cache());
     assertNoErrors(rawGL);
 
     var value = gl.getError();

Modified: trunk/Source/WebCore/ChangeLog (139728 => 139729)


--- trunk/Source/WebCore/ChangeLog	2013-01-15 09:42:25 UTC (rev 139728)
+++ trunk/Source/WebCore/ChangeLog	2013-01-15 09:46:29 UTC (rev 139729)
@@ -1,3 +1,19 @@
+2013-01-15  Andrey Adaikin  <aand...@chromium.org>
+
+        Web Inspector: [Canvas] introduce CallArgument type into the protocol
+        https://bugs.webkit.org/show_bug.cgi?id=106640
+
+        Reviewed by Yury Semikhatsky.
+
+        CallArgument type abstraction to describe arguments of a canvas context call.
+        Drive-by: Introduce a CanvasContext to fix the wrong contextId value in the protocol.
+        The contextId should point to the Resource that represents a context (2D or 3D canvas).
+
+        * inspector/InjectedScriptCanvasModuleSource.js:
+        (.):
+        * inspector/Inspector.json:
+        * inspector/front-end/CanvasProfileView.js:
+
 2012-12-28  Vsevolod Vlasov  <vse...@chromium.org>
 
         Web Inspector: Support inspector file system access with isolated file system through InspectorFrontendHost.

Modified: trunk/Source/WebCore/inspector/InjectedScriptCanvasModuleSource.js (139728 => 139729)


--- trunk/Source/WebCore/inspector/InjectedScriptCanvasModuleSource.js	2013-01-15 09:42:25 UTC (rev 139728)
+++ trunk/Source/WebCore/inspector/InjectedScriptCanvasModuleSource.js	2013-01-15 09:46:29 UTC (rev 139729)
@@ -396,7 +396,8 @@
     setAttachment: function(name, attachment)
     {
         if (attachment) {
-            this._attachments = this._attachments || {};
+            /** @type {Object.<string, Object>} */
+            this._attachments = this._attachments || Object.create(null);
             this._attachments[name] = attachment;
         } else if (this._attachments)
             delete this._attachments[name];
@@ -446,7 +447,7 @@
      */
     replay: function(replayableCall, cache)
     {
-        var replayObject = ReplayableResource.replay(replayableCall.resource(), cache);
+        var replayObject = ReplayableResource.replay(replayableCall.replayableResource(), cache);
         var replayArgs = replayableCall.args().map(function(obj) {
             return ReplayableResource.replay(obj, cache);
         });
@@ -502,7 +503,7 @@
     /**
      * @return {ReplayableResource}
      */
-    resource: function()
+    replayableResource: function()
     {
         return this._thisObject;
     },
@@ -578,11 +579,16 @@
 /**
  * @constructor
  * @param {!Object} wrappedObject
+ * @param {string} name
  */
-function Resource(wrappedObject)
+function Resource(wrappedObject, name)
 {
     /** @type {number} */
     this._id = ++Resource._uniqueId;
+    /** @type {string} */
+    this._name = name || "Resource";
+    /** @type {number} */
+    this._kindId = Resource._uniqueKindIds[this._name] = (Resource._uniqueKindIds[this._name] || 0) + 1;
     /** @type {ResourceTrackingManager} */
     this._resourceManager = null;
     /** @type {!Array.<Call>} */
@@ -605,6 +611,11 @@
 Resource._uniqueId = 0;
 
 /**
+ * @type {!Object.<string, number>}
+ */
+Resource._uniqueKindIds = {};
+
+/**
  * @param {*} obj
  * @return {Resource}
  */
@@ -703,6 +714,29 @@
     },
 
     /**
+     * @return {ContextResource}
+     */
+    contextResource: function()
+    {
+        if (this instanceof ContextResource)
+            return /** @type {ContextResource} */ (this);
+
+        if (this._calculatingContextResource)
+            return null;
+
+        this._calculatingContextResource = true;
+        var result = null;
+        for (var i = 0, n = this._calls.length; i < n; ++i) {
+            result = this._calls[i].resource().contextResource();
+            if (result)
+                break;
+        }
+        delete this._calculatingContextResource;
+        console.assert(result, "Failed to find context resource for " + this._name + "@" + this._kindId);
+        return result;
+    },
+
+    /**
      * @param {!Cache} cache
      * @return {!ReplayableResource}
      */
@@ -712,7 +746,9 @@
         if (result)
             return result;
         var data = {
-            id: this._id
+            id: this._id,
+            name: this._name,
+            kindId: this._kindId
         };
         result = new ReplayableResource(this, data);
         cache.put(this._id, result); // Put into the cache early to avoid loops.
@@ -720,6 +756,9 @@
             return call.toReplayable(cache);
         });
         this._populateReplayableData(data, cache);
+        var contextResource = this.contextResource();
+        if (contextResource !== this)
+            data.contextResource = Resource.toReplayable(contextResource, cache);
         return result;
     },
 
@@ -743,6 +782,8 @@
         if (resource)
             return resource;
         this._id = data.id;
+        this._name = data.name;
+        this._kindId = data.kindId;
         this._resourceManager = null;
         this._calls = [];
         this._boundResources = Object.create(null);
@@ -983,10 +1024,11 @@
 }
 
 /**
- * @param {function(new:Resource, !Object)} resourceConstructor
+ * @param {function(new:Resource, !Object, string)} resourceConstructor
+ * @param {string} resourceName
  * @return {function(this:Resource.WrapFunction)}
  */
-Resource.WrapFunction.resourceFactoryMethod = function(resourceConstructor)
+Resource.WrapFunction.resourceFactoryMethod = function(resourceConstructor, resourceName)
 {
     /** @this Resource.WrapFunction */
     return function()
@@ -994,7 +1036,7 @@
         var wrappedObject = /** @type {Object} */ (this.result());
         if (!wrappedObject)
             return;
-        var resource = new resourceConstructor(wrappedObject);
+        var resource = new resourceConstructor(wrappedObject, resourceName);
         var manager = this._resource.manager();
         if (manager)
             manager.registerResource(resource);
@@ -1024,6 +1066,22 @@
     },
 
     /**
+     * @return {string}
+     */
+    description: function()
+    {
+        return this._data.name + "@" + this._data.kindId;
+    },
+
+    /**
+     * @return {!ReplayableResource}
+     */
+    replayableContextResource: function()
+    {
+        return this._data.contextResource || this;
+    },
+
+    /**
      * @param {!Cache} cache
      * @return {!Resource}
      */
@@ -1049,12 +1107,29 @@
 /**
  * @constructor
  * @extends {Resource}
+ * @param {!Object} wrappedObject
+ * @param {string} name
  */
-function LogEverythingResource(wrappedObject)
+function ContextResource(wrappedObject, name)
 {
-    Resource.call(this, wrappedObject);
+    Resource.call(this, wrappedObject, name);
 }
 
+ContextResource.prototype = {
+    __proto__: Resource.prototype
+}
+
+/**
+ * @constructor
+ * @extends {Resource}
+ * @param {!Object} wrappedObject
+ * @param {string} name
+ */
+function LogEverythingResource(wrappedObject, name)
+{
+    Resource.call(this, wrappedObject, name);
+}
+
 LogEverythingResource.prototype = {
     /**
      * @override
@@ -1086,10 +1161,12 @@
 /**
  * @constructor
  * @extends {Resource}
+ * @param {!Object} wrappedObject
+ * @param {string} name
  */
-function WebGLBoundResource(wrappedObject)
+function WebGLBoundResource(wrappedObject, name)
 {
-    Resource.call(this, wrappedObject);
+    Resource.call(this, wrappedObject, name);
     /** @type {!Object.<string, *>} */
     this._state = {};
 }
@@ -1116,14 +1193,9 @@
      */
     _doReplayCalls: function(data, cache)
     {
-        var state = {};
-        Object.keys(data.state).forEach(function(parameter) {
-            state[parameter] = ReplayableResource.replay(data.state[parameter], cache);
-        });
-        this._state = state;
-
         var gl = this._replayContextResource(data, cache).wrappedObject();
 
+        /** @type {!Object.<string, Array.<string>>} */
         var bindingsData = {
             TEXTURE_2D: ["bindTexture", "TEXTURE_BINDING_2D"],
             TEXTURE_CUBE_MAP: ["bindTexture", "TEXTURE_BINDING_CUBE_MAP"],
@@ -1138,6 +1210,11 @@
             originalBindings[bindingTarget] = gl.getParameter(gl[bindingParameter]);
         });
 
+        var state = {};
+        Object.keys(data.state).forEach(function(parameter) {
+            state[parameter] = ReplayableResource.replay(data.state[parameter], cache);
+        });
+        this._state = state;
         Resource.prototype._doReplayCalls.call(this, data, cache);
 
         Object.keys(bindingsData).forEach(function(bindingTarget) {
@@ -1153,9 +1230,9 @@
      */
     _replayContextResource: function(data, cache)
     {
-        var calls = data.calls;
+        var calls = /** @type {!Array.<ReplayableCall>} */ (data.calls);
         for (var i = 0, n = calls.length; i < n; ++i) {
-            var resource = ReplayableResource.replay(calls[i].resource(), cache);
+            var resource = ReplayableResource.replay(calls[i].replayableResource(), cache);
             var contextResource = WebGLRenderingContextResource.forObject(resource);
             if (contextResource)
                 return contextResource;
@@ -1181,10 +1258,12 @@
 /**
  * @constructor
  * @extends {WebGLBoundResource}
+ * @param {!Object} wrappedObject
+ * @param {string} name
  */
-function WebGLTextureResource(wrappedObject)
+function WebGLTextureResource(wrappedObject, name)
 {
-    WebGLBoundResource.call(this, wrappedObject);
+    WebGLBoundResource.call(this, wrappedObject, name);
 }
 
 WebGLTextureResource.prototype = {
@@ -1254,7 +1333,7 @@
     {
         var glResource = WebGLRenderingContextResource.forObject(call.resource());
         var gl = glResource.wrappedObject();
-        var framebufferResource = /** @type {WebGLFramebufferResource} */ glResource.currentBinding(gl.FRAMEBUFFER);
+        var framebufferResource = /** @type {WebGLFramebufferResource} */ (glResource.currentBinding(gl.FRAMEBUFFER));
         if (framebufferResource)
             this.pushCall(new Call(glResource, "bindFramebuffer", [gl.FRAMEBUFFER, framebufferResource]));
         else {
@@ -1270,10 +1349,12 @@
 /**
  * @constructor
  * @extends {Resource}
+ * @param {!Object} wrappedObject
+ * @param {string} name
  */
-function WebGLProgramResource(wrappedObject)
+function WebGLProgramResource(wrappedObject, name)
 {
-    Resource.call(this, wrappedObject);
+    Resource.call(this, wrappedObject, name);
 }
 
 WebGLProgramResource.prototype = {
@@ -1300,7 +1381,7 @@
         var originalErrors = glResource.getAllErrors();
 
         var uniforms = [];
-        var uniformsCount = /** @type {number} */ gl.getProgramParameter(program, gl.ACTIVE_UNIFORMS);
+        var uniformsCount = /** @type {number} */ (gl.getProgramParameter(program, gl.ACTIVE_UNIFORMS));
         for (var i = 0; i < uniformsCount; ++i) {
             var activeInfo = gl.getActiveUniform(program, i);
             if (!activeInfo)
@@ -1403,10 +1484,12 @@
 /**
  * @constructor
  * @extends {Resource}
+ * @param {!Object} wrappedObject
+ * @param {string} name
  */
-function WebGLShaderResource(wrappedObject)
+function WebGLShaderResource(wrappedObject, name)
 {
-    Resource.call(this, wrappedObject);
+    Resource.call(this, wrappedObject, name);
 }
 
 WebGLShaderResource.prototype = {
@@ -1439,10 +1522,12 @@
 /**
  * @constructor
  * @extends {WebGLBoundResource}
+ * @param {!Object} wrappedObject
+ * @param {string} name
  */
-function WebGLBufferResource(wrappedObject)
+function WebGLBufferResource(wrappedObject, name)
 {
-    WebGLBoundResource.call(this, wrappedObject);
+    WebGLBoundResource.call(this, wrappedObject, name);
 }
 
 WebGLBufferResource.prototype = {
@@ -1463,10 +1548,12 @@
 /**
  * @constructor
  * @extends {WebGLBoundResource}
+ * @param {!Object} wrappedObject
+ * @param {string} name
  */
-function WebGLFramebufferResource(wrappedObject)
+function WebGLFramebufferResource(wrappedObject, name)
 {
-    WebGLBoundResource.call(this, wrappedObject);
+    WebGLBoundResource.call(this, wrappedObject, name);
 }
 
 WebGLFramebufferResource.prototype = {
@@ -1486,10 +1573,12 @@
 /**
  * @constructor
  * @extends {WebGLBoundResource}
+ * @param {!Object} wrappedObject
+ * @param {string} name
  */
-function WebGLRenderbufferResource(wrappedObject)
+function WebGLRenderbufferResource(wrappedObject, name)
 {
-    WebGLBoundResource.call(this, wrappedObject);
+    WebGLBoundResource.call(this, wrappedObject, name);
 }
 
 WebGLRenderbufferResource.prototype = {
@@ -1508,13 +1597,13 @@
 
 /**
  * @constructor
- * @extends {Resource}
+ * @extends {ContextResource}
  * @param {!WebGLRenderingContext} glContext
  * @param {function():WebGLRenderingContext} replayContextCallback
  */
 function WebGLRenderingContextResource(glContext, replayContextCallback)
 {
-    Resource.call(this, glContext);
+    ContextResource.call(this, glContext, "WebGLRenderingContext");
     this._replayContextCallback = replayContextCallback;
     /** @type {Object.<number, boolean>} */
     this._customErrors = null;
@@ -1613,12 +1702,9 @@
 WebGLRenderingContextResource.forObject = function(obj)
 {
     var resource = Resource.forObject(obj);
-    if (!resource || resource instanceof WebGLRenderingContextResource)
-        return resource;
-    var calls = resource.calls();
-    if (!calls || !calls.length)
+    if (!resource)
         return null;
-    resource = calls[0].resource();
+    resource = resource.contextResource();
     return (resource instanceof WebGLRenderingContextResource) ? resource : null;
 }
 
@@ -1863,7 +1949,7 @@
         }
         gl.activeTexture(glState.ACTIVE_TEXTURE);
 
-        Resource.prototype._doReplayCalls.call(this, data, cache);
+        ContextResource.prototype._doReplayCalls.call(this, data, cache);
     },
 
     /**
@@ -1931,13 +2017,13 @@
         if (!wrapFunctions) {
             wrapFunctions = Object.create(null);
 
-            wrapFunctions["createBuffer"] = Resource.WrapFunction.resourceFactoryMethod(WebGLBufferResource);
-            wrapFunctions["createShader"] = Resource.WrapFunction.resourceFactoryMethod(WebGLShaderResource);
-            wrapFunctions["createProgram"] = Resource.WrapFunction.resourceFactoryMethod(WebGLProgramResource);
-            wrapFunctions["createTexture"] = Resource.WrapFunction.resourceFactoryMethod(WebGLTextureResource);
-            wrapFunctions["createFramebuffer"] = Resource.WrapFunction.resourceFactoryMethod(WebGLFramebufferResource);
-            wrapFunctions["createRenderbuffer"] = Resource.WrapFunction.resourceFactoryMethod(WebGLRenderbufferResource);
-            wrapFunctions["getUniformLocation"] = Resource.WrapFunction.resourceFactoryMethod(Resource);
+            wrapFunctions["createBuffer"] = Resource.WrapFunction.resourceFactoryMethod(WebGLBufferResource, "WebGLBuffer");
+            wrapFunctions["createShader"] = Resource.WrapFunction.resourceFactoryMethod(WebGLShaderResource, "WebGLShader");
+            wrapFunctions["createProgram"] = Resource.WrapFunction.resourceFactoryMethod(WebGLProgramResource, "WebGLProgram");
+            wrapFunctions["createTexture"] = Resource.WrapFunction.resourceFactoryMethod(WebGLTextureResource, "WebGLTexture");
+            wrapFunctions["createFramebuffer"] = Resource.WrapFunction.resourceFactoryMethod(WebGLFramebufferResource, "WebGLFramebuffer");
+            wrapFunctions["createRenderbuffer"] = Resource.WrapFunction.resourceFactoryMethod(WebGLRenderbufferResource, "WebGLRenderbuffer");
+            wrapFunctions["getUniformLocation"] = Resource.WrapFunction.resourceFactoryMethod(Resource, "WebGLUniformLocation");
 
             /**
              * @param {string} methodName
@@ -2089,7 +2175,7 @@
         return wrapFunctions;
     },
 
-    __proto__: Resource.prototype
+    __proto__: ContextResource.prototype
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -2098,13 +2184,13 @@
 
 /**
  * @constructor
- * @extends {Resource}
+ * @extends {ContextResource}
  * @param {!CanvasRenderingContext2D} context
  * @param {function():CanvasRenderingContext2D} replayContextCallback
  */
 function CanvasRenderingContext2DResource(context, replayContextCallback)
 {
-    Resource.call(this, context);
+    ContextResource.call(this, context, "CanvasRenderingContext2D");
     this._replayContextCallback = replayContextCallback;
 }
 
@@ -2433,9 +2519,9 @@
         if (!wrapFunctions) {
             wrapFunctions = Object.create(null);
 
-            wrapFunctions["createLinearGradient"] = Resource.WrapFunction.resourceFactoryMethod(LogEverythingResource);
-            wrapFunctions["createRadialGradient"] = Resource.WrapFunction.resourceFactoryMethod(LogEverythingResource);
-            wrapFunctions["createPattern"] = Resource.WrapFunction.resourceFactoryMethod(LogEverythingResource);
+            wrapFunctions["createLinearGradient"] = Resource.WrapFunction.resourceFactoryMethod(LogEverythingResource, "CanvasGradient");
+            wrapFunctions["createRadialGradient"] = Resource.WrapFunction.resourceFactoryMethod(LogEverythingResource, "CanvasGradient");
+            wrapFunctions["createPattern"] = Resource.WrapFunction.resourceFactoryMethod(LogEverythingResource, "CanvasPattern");
 
             /**
              * @param {string} methodName
@@ -2472,7 +2558,7 @@
         return wrapFunctions;
     },
 
-    __proto__: Resource.prototype
+    __proto__: ContextResource.prototype
 }
 
 /**
@@ -2516,12 +2602,7 @@
      */
     addCall: function(call)
     {
-        var res = Resource.forObject(call.result());
-        if (res)
-            this.captureResource(res);
-        var size = this._replayablesCache.size();
         this._replayableCalls.push(call.toReplayable(this._replayablesCache));
-        console.assert(this._replayablesCache.size() === size, "Internal error: We should have captured all the resources already by this time.");
     }
 }
 
@@ -2710,7 +2791,7 @@
 /**
  * @constructor
  */
-var InjectedScript = function()
+var InjectedCanvasModule = function()
 {
     /** @type {!ResourceTrackingManager} */
     this._manager = new ResourceTrackingManager();
@@ -2724,7 +2805,7 @@
     this._replayContexts = [];
 }
 
-InjectedScript.prototype = {
+InjectedCanvasModule.prototype = {
     /**
      * @param {!WebGLRenderingContext} glContext
      * @return {Object}
@@ -2827,33 +2908,43 @@
         var calls = traceLog.replayableCalls();
         for (var i = startOffset, n = calls.length; i < n; ++i) {
             var call = calls[i];
-            var args = call.args().map(function(argument) {
-                return argument + "";
-            });
+            var contextResource = call.replayableResource().replayableContextResource();
             var stackTrace = call.stackTrace();
             var callFrame = stackTrace ? stackTrace.callFrame(0) || {} : {};
             var traceLogItem = {
-                contextId: this._makeContextId(call.resource().id()),
+                contextId: this._makeContextId(contextResource.id()),
                 sourceURL: callFrame.sourceURL,
                 lineNumber: callFrame.lineNumber,
                 columnNumber: callFrame.columnNumber
             };
             if (call.functionName()) {
                 traceLogItem.functionName = call.functionName();
-                traceLogItem.arguments = args;
+                traceLogItem.arguments = call.args().map(this._createRemoteObject.bind(this));
+                if (call.result() !== undefined)
+                    traceLogItem.result = this._createRemoteObject(call.result());
             } else {
-                traceLogItem.property = args[0];
-                traceLogItem.value = args[1];
+                traceLogItem.property = call.args()[0];
+                traceLogItem.value = this._createRemoteObject(call.args()[1]);
             }
-            var callResult = call.result();
-            if (callResult !== undefined && callResult !== null)
-                traceLogItem.result = callResult + "";
             result.calls.push(traceLogItem);
         }
         return result;
     },
 
     /**
+     * @param {*} obj
+     * @return {Object}
+     */
+    _createRemoteObject: function(obj)
+    {
+        if (obj instanceof ReplayableResource)
+            var description = obj.description();
+        else
+            var description = "" + obj;
+        return { description: description };
+    },
+
+    /**
      * @param {string} id
      * @param {number} stepNo
      * @return {string}
@@ -2945,7 +3036,7 @@
     }
 }
 
-var injectedScript = new InjectedScript();
-return injectedScript;
+var injectedCanvasModule = new InjectedCanvasModule();
+return injectedCanvasModule;
 
 })

Modified: trunk/Source/WebCore/inspector/Inspector.json (139728 => 139729)


--- trunk/Source/WebCore/inspector/Inspector.json	2013-01-15 09:42:25 UTC (rev 139728)
+++ trunk/Source/WebCore/inspector/Inspector.json	2013-01-15 09:46:29 UTC (rev 139729)
@@ -3196,15 +3196,22 @@
                 "description": "Unique context identifier."
             },
             {
+                "id": "CallArgument",
+                "type": "object",
+                "properties": [
+                    { "name": "description", "type": "string" }
+                ]
+            },
+            {
                 "id": "Call",
                 "type": "object",
                 "properties": [
                     { "name": "contextId", "$ref": "ContextId" },
                     { "name": "functionName", "type": "string", "optional": true },
-                    { "name": "arguments", "type": "array", "items": { "type": "string" }, "optional": true },
+                    { "name": "arguments", "type": "array", "items": { "$ref": "CallArgument" }, "optional": true },
+                    { "name": "result", "$ref": "CallArgument", "optional": true },
                     { "name": "property", "type": "string", "optional": true },
-                    { "name": "value", "type": "string", "optional": true },
-                    { "name": "result", "type": "string", "optional": true },
+                    { "name": "value", "$ref": "CallArgument", "optional": true },
                     { "name": "sourceURL", "type": "string", "optional": true },
                     { "name": "lineNumber", "type": "integer", "optional": true },
                     { "name": "columnNumber", "type": "integer", "optional": true }

Modified: trunk/Source/WebCore/inspector/front-end/CanvasProfileView.js (139728 => 139729)


--- trunk/Source/WebCore/inspector/front-end/CanvasProfileView.js	2013-01-15 09:42:25 UTC (rev 139728)
+++ trunk/Source/WebCore/inspector/front-end/CanvasProfileView.js	2013-01-15 09:46:29 UTC (rev 139729)
@@ -217,7 +217,6 @@
      */
     _createCallNode: function(index, call)
     {
-        var traceLogItem = document.createElement("div");
         var data = ""
         data[0] = index + 1;
         data[1] = call.functionName || "context." + call.property;
@@ -229,16 +228,18 @@
             data[2] = this._linkifier.linkifyLocation(call.sourceURL, lineNumber, columnNumber);
         }
 
-        if (call.arguments)
-            data[1] += "(" + call.arguments.join(", ") + ")";
-        else
-            data[1] += " = " + call.value;
+        if (call.arguments) {
+            var args = call.arguments.map(function(argument) {
+                return argument.description;
+            });
+            data[1] += "(" + args.join(", ") + ")";
+        } else
+            data[1] += " = " + call.value.description;
 
         if (typeof call.result !== "undefined")
-            data[1] += " => " + call.result;
+            data[1] += " => " + call.result.description;
 
         var node = new WebInspector.DataGridNode(data);
-        node.call = call;
         node.index = index;
         node.selectable = true;
         return node;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to