Changeset 86836 in webkit
- Timestamp:
- May 19, 2011 4:10:45 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/inspector/protocol/runtime-agent-expected.txt
r83583 r86836 22 22 hasChildren : true 23 23 type : "object" 24 className : <string> 24 25 description : "TestObject" 25 26 } … … 48 49 hasChildren : true 49 50 type : "object" 51 className : <string> 50 52 description : "TestObject" 51 53 } … … 157 159 hasChildren : true 158 160 type : "object" 161 className : <string> 159 162 description : "TestObject" 160 163 } -
trunk/LayoutTests/inspector/protocol/runtime-agent.html
r82804 r86836 28 28 ["RuntimeAgent", "releaseObjectGroup", 'test']]; 29 29 30 InspectorTest.runProtocolTestSuite("RuntimeAgent", testSuite, ['id', 'requestId', 'objectId' ]);30 InspectorTest.runProtocolTestSuite("RuntimeAgent", testSuite, ['id', 'requestId', 'objectId', 'className']); 31 31 } 32 32 -
trunk/Source/WebCore/ChangeLog
r86835 r86836 1 2011-05-19 Pavel Feldman <pfeldman@google.com> 2 3 Reviewed by Yury Semikhatsky. 4 5 Web Inspector: expose object class name as a part of RemoteObject mirror. 6 https://bugs.webkit.org/show_bug.cgi?id=61067 7 8 * inspector/InjectedScriptSource.js: 9 * inspector/Inspector.json: 10 1 11 2011-05-19 Pavel Feldman <pfeldman@google.com> 2 12 -
trunk/Source/WebCore/inspector/InjectedScriptSource.js
r86835 r86836 420 420 var injectedScript = new InjectedScript(); 421 421 422 InjectedScript.RemoteObject = function(objectId, type, description, hasChildren)422 InjectedScript.RemoteObject = function(objectId, type, className, description, hasChildren) 423 423 { 424 424 if (objectId) { … … 427 427 } 428 428 this.type = type; 429 if (className) 430 this.className = className; 429 431 this.description = description; 430 432 } … … 437 439 var description = "<failed to convert exception to string>"; 438 440 } 439 return new InjectedScript.RemoteObject(null, "string", "[ Exception: " + description + " ]");441 return new InjectedScript.RemoteObject(null, "string", null, "[ Exception: " + description + " ]"); 440 442 } 441 443 … … 446 448 var rawType = typeof object; 447 449 var hasChildren = (rawType === "object" && object !== null && (!!Object.getOwnPropertyNames(object).length || !!object.__proto__)) || rawType === "function"; 448 var description = "";450 var className = InjectedScriptHost.internalConstructorName(object); 449 451 var description = injectedScript._describe(object); 450 return new InjectedScript.RemoteObject(objectId, type, description, hasChildren);452 return new InjectedScript.RemoteObject(objectId, type, className, description, hasChildren); 451 453 } 452 454 -
trunk/Source/WebCore/inspector/Inspector.json
r86835 r86836 224 224 { "name": "hasChildren", "type": "boolean", "optional": true, "description": "True when this object can be queried for children." }, 225 225 { "name": "objectId", "type": "string", "optional": true, "description": "Unique object identifier (for non-primitive values)." }, 226 { "name": "type", "type": "string", "enum": ["object", "array", "function", "null", "node", "undefined", "string", "number", "boolean", "regexp", "date"], "description": "Object type." } 226 { "name": "type", "type": "string", "enum": ["object", "array", "function", "null", "node", "undefined", "string", "number", "boolean", "regexp", "date"], "description": "Object type." }, 227 { "name": "className", "type": "string", "optional": true, "description": "Object class name." } 227 228 ] 228 229 },
Note: See TracChangeset
for help on using the changeset viewer.