Diff
Modified: trunk/LayoutTests/ChangeLog (147220 => 147221)
--- trunk/LayoutTests/ChangeLog 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/LayoutTests/ChangeLog 2013-03-29 15:50:44 UTC (rev 147221)
@@ -1,3 +1,19 @@
+2013-03-29 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r147218.
+ http://trac.webkit.org/changeset/147218
+ https://bugs.webkit.org/show_bug.cgi?id=113585
+
+ We should rethink UI of this feature. (Requested by vsevik on
+ #webkit).
+
+ * inspector/console/command-line-api-expected.txt:
+ * inspector/debugger/properties-special-expected.txt:
+ * inspector/debugger/properties-special.html:
+ * inspector/runtime/runtime-getProperties-expected.txt:
+ * inspector/runtime/runtime-getProperties.html:
+ * platform/chromium/inspector/debugger/properties-special-expected.txt:
+
2013-03-29 Seokju Kwon <seokju.k...@gmail.com>
Web Inspector: Update test expectation for resource-har-conversion.html
Modified: trunk/LayoutTests/inspector/console/command-line-api-expected.txt (147220 => 147221)
--- trunk/LayoutTests/inspector/console/command-line-api-expected.txt 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/LayoutTests/inspector/console/command-line-api-expected.txt 2013-03-29 15:50:44 UTC (rev 147221)
@@ -1,4 +1,4 @@
-CONSOLE MESSAGE: line 1226: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $("#%s")
+CONSOLE MESSAGE: line 1222: The console function $() has changed from $=getElementById(id) to $=querySelector(selector). You might try $("#%s")
Tests that command line api works.
Modified: trunk/LayoutTests/inspector/debugger/properties-special-expected.txt (147220 => 147221)
--- trunk/LayoutTests/inspector/debugger/properties-special-expected.txt 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/LayoutTests/inspector/debugger/properties-special-expected.txt 2013-03-29 15:50:44 UTC (rev 147221)
@@ -5,8 +5,6 @@
Set timer for test function.
Watch expressions updated.
Nodes are expanded.
-error: Function scope data is not available
-Subnodes are expanded.
'Object(true)' => 'Boolean'
'__proto__' => 'Boolean'
'(function(a,b) { return a + b; })' => 'function (a, b) { return a + b; }'
@@ -15,19 +13,15 @@
'length' => '2'
'name' => '""'
'prototype' => 'Object'
- 'constructor' => 'function (a, b) { return a + b; }'
- '__proto__' => 'Object'
'__proto__' => 'function () {'
<function scope>
'(function(a,b) { return a + b; }).bind({}, 2)' => 'function () {'
- 'arguments' => null
- 'get' => 'function () {'
- 'set' => 'function () {'
- 'caller' => null
- 'get' => 'function () {'
- 'set' => 'function () {'
+ 'get arguments' => 'function () {'
+ 'get caller' => 'function () {'
'length' => '1'
'name' => '""'
+ 'set arguments' => 'function () {'
+ 'set caller' => 'function () {'
'__proto__' => 'function () {'
<function scope>
Debugger was disabled.
Modified: trunk/LayoutTests/inspector/debugger/properties-special.html (147220 => 147221)
--- trunk/LayoutTests/inspector/debugger/properties-special.html 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/LayoutTests/inspector/debugger/properties-special.html 2013-03-29 15:50:44 UTC (rev 147221)
@@ -64,21 +64,6 @@
function nodesExpanded()
{
InspectorTest.addResult("Nodes are expanded.");
- var treeNodes = watchExpressionsSection.propertiesTreeOutline.children;
- for (var i = 0; i < treeNodes.length; i++) {
- var children = treeNodes[i].children;
- for (var j = 0; j < children.length; j++) {
- if (children[j].nameElement && children[j].nameElement.textContent === "__proto__")
- continue;
- children[j].expand();
- }
- }
- InspectorTest.runAfterPendingDispatches(subnodesExpanded);
- }
-
- function subnodesExpanded()
- {
- InspectorTest.addResult("Subnodes are expanded.");
InspectorTest.dumpObjectPropertySectionDeep(watchExpressionsSection);
// Clear watch expressions after execution.
Modified: trunk/LayoutTests/inspector/runtime/runtime-getProperties-expected.txt (147220 => 147221)
--- trunk/LayoutTests/inspector/runtime/runtime-getProperties-expected.txt 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/LayoutTests/inspector/runtime/runtime-getProperties-expected.txt 2013-03-29 15:50:44 UTC (rev 147221)
@@ -6,13 +6,18 @@
Running: testGetterAndSetter
{
enumerable : true
- getter : {
+ name : "get foo"
+ value : {
description : "function () { return 1; }"
objectId : <string>
type : "function"
}
- name : "foo"
- setter : {
+ writable : false
+}
+{
+ enumerable : true
+ name : "set foo"
+ value : {
description : "function (value) { }"
objectId : <string>
type : "function"
@@ -23,13 +28,18 @@
Running: testGetterOnly
{
enumerable : true
- getter : {
+ name : "get foo"
+ value : {
description : "function () { return 1; }"
objectId : <string>
type : "function"
}
- name : "foo"
- setter : {
+ writable : false
+}
+{
+ enumerable : true
+ name : "set foo"
+ value : {
description : "undefined"
objectId : <undefined>
type : "undefined"
Modified: trunk/LayoutTests/inspector/runtime/runtime-getProperties.html (147220 => 147221)
--- trunk/LayoutTests/inspector/runtime/runtime-getProperties.html 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/LayoutTests/inspector/runtime/runtime-getProperties.html 2013-03-29 15:50:44 UTC (rev 147221)
@@ -60,21 +60,14 @@
}
]);
- function convertPropertyValueForTest(propertyObject, fieldName)
- {
- var value = propertyObject[fieldName];
- if (value)
- propertyObject[fieldName] = { type: value.type, description: value.description.replace("function foo", "function "), objectId: value.objectId };
- }
-
function dumpProperty(property)
{
if (property.name === "__proto__")
return;
- convertPropertyValueForTest(property, "value");
- convertPropertyValueForTest(property, "getter");
- convertPropertyValueForTest(property, "setter");
+ var value = property.value;
+ if (value)
+ property.value = { type: value.type, description: value.description.replace("function foo", "function "), objectId: value.objectId };
InspectorTest.dump(property, { objectId: "formatAsTypeName" });
}
}
Modified: trunk/LayoutTests/platform/chromium/inspector/debugger/properties-special-expected.txt (147220 => 147221)
--- trunk/LayoutTests/platform/chromium/inspector/debugger/properties-special-expected.txt 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/LayoutTests/platform/chromium/inspector/debugger/properties-special-expected.txt 2013-03-29 15:50:44 UTC (rev 147221)
@@ -5,7 +5,6 @@
Set timer for test function.
Watch expressions updated.
Nodes are expanded.
-Subnodes are expanded.
'Object(true)' => 'Boolean'
'__proto__' => 'Boolean'
'[[PrimitiveValue]]' => 'true'
@@ -15,36 +14,18 @@
'length' => '2'
'name' => '""'
'prototype' => 'Object'
- 'constructor' => 'function (a,b) { return a + b; }'
- '__proto__' => 'Object'
'__proto__' => 'function Empty() {}'
<function scope>
- 'With Block' => 'Object'
- Closure
- 'Global' => 'Window'
'(function(a,b) { return a + b; }).bind({}, 2)' => 'function () { [native code] }'
- 'arguments' => null
- 'get' => 'function ThrowTypeError() { [native code] }'
- 'set' => 'function ThrowTypeError() { [native code] }'
- 'caller' => null
- 'get' => 'function ThrowTypeError() { [native code] }'
- 'set' => 'function ThrowTypeError() { [native code] }'
+ 'get arguments' => 'function ThrowTypeError() { [native code] }'
+ 'get caller' => 'function ThrowTypeError() { [native code] }'
'length' => '1'
'name' => '""'
+ 'set arguments' => 'function ThrowTypeError() { [native code] }'
+ 'set caller' => 'function ThrowTypeError() { [native code] }'
'__proto__' => 'function Empty() {}'
'[[TargetFunction]]' => 'function (a,b) { return a + b; }'
- 'arguments' => 'null'
- 'caller' => 'null'
- 'length' => '2'
- 'name' => '""'
- 'prototype' => 'Object'
- '__proto__' => 'function Empty() {}'
- <function scope>
'[[BoundThis]]' => 'Object'
- '__proto__' => 'Object'
'[[BoundArgs]]' => 'Array[1]'
- '0' => '2'
- 'length' => '1'
- '__proto__' => 'Array[0]'
Debugger was disabled.
Modified: trunk/Source/WebCore/ChangeLog (147220 => 147221)
--- trunk/Source/WebCore/ChangeLog 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/Source/WebCore/ChangeLog 2013-03-29 15:50:44 UTC (rev 147221)
@@ -1,3 +1,21 @@
+2013-03-29 Sheriff Bot <webkit.review....@gmail.com>
+
+ Unreviewed, rolling out r147218.
+ http://trac.webkit.org/changeset/147218
+ https://bugs.webkit.org/show_bug.cgi?id=113585
+
+ We should rethink UI of this feature. (Requested by vsevik on
+ #webkit).
+
+ * inspector/InjectedScriptSource.js:
+ (.):
+ * inspector/front-end/ObjectPropertiesSection.js:
+ (WebInspector.ObjectPropertyTreeElement.populateWithProperties):
+ * inspector/front-end/RemoteObject.js:
+ (WebInspector.RemoteObject.prototype.set else):
+ (WebInspector.RemoteObjectProperty):
+ * inspector/front-end/inspector.css:
+
2013-03-29 Andrey Kosyakov <ca...@chromium.org>
Web Inspector: extract common base for 3 timeline overview controls (Events/Frames/Memory)
Modified: trunk/Source/WebCore/inspector/InjectedScriptSource.js (147220 => 147221)
--- trunk/Source/WebCore/inspector/InjectedScriptSource.js 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/Source/WebCore/inspector/InjectedScriptSource.js 2013-03-29 15:50:44 UTC (rev 147221)
@@ -345,10 +345,6 @@
if (typeof func !== "function")
return "Cannot resolve function by id.";
var details = InjectedScriptHost.functionDetails(func);
-
- if (details === undefined)
- return "Function scope data is not available";
-
if ("rawScopes" in details) {
var objectGroupName = this._idToObjectGroupName[parsedFunctionId.id];
var rawScopes = details.rawScopes;
Modified: trunk/Source/WebCore/inspector/front-end/ObjectPropertiesSection.js (147220 => 147221)
--- trunk/Source/WebCore/inspector/front-end/ObjectPropertiesSection.js 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/Source/WebCore/inspector/front-end/ObjectPropertiesSection.js 2013-03-29 15:50:44 UTC (rev 147221)
@@ -478,10 +478,7 @@
if (skipProto && properties[i].name === "__proto__")
continue;
properties[i].parentObject = value;
- if (properties[i].value)
- treeElement.appendChild(new treeElementConstructor(properties[i]));
- else
- treeElement.appendChild(new WebInspector.AccessorPropertyTreeElement(properties[i]));
+ treeElement.appendChild(new treeElementConstructor(properties[i]));
}
if (value && value.type === "function") {
// Whether function has TargetFunction internal property.
@@ -597,61 +594,7 @@
/**
* @constructor
- * @param {WebInspector.RemoteObjectProperty} property accessor property
* @extends {TreeElement}
- */
-WebInspector.AccessorPropertyTreeElement = function(property)
-{
- TreeElement.call(this, "", null, false);
- this._property = property;
- this.toggleOnClick = true;
- this.selectable = false;
- this.hasChildren = true;
-}
-
-WebInspector.AccessorPropertyTreeElement.prototype = {
- onattach: function()
- {
- this.update();
- },
-
- update: function()
- {
- var markerElement = document.createElement("span");
- markerElement.textContent = "\u2388";
- markerElement.className = "name accessor-property-name";
-
- var nameElement = document.createElement("span");
- nameElement.textContent = this._property.name;
- nameElement.className = "name accessor-property-name";
-
- this.listItemElement.removeChildren();
- this.listItemElement.appendChild(markerElement);
- this.listItemElement.appendChild(nameElement);
-
- this.nameElement = nameElement;
- },
-
- onpopulate: function()
- {
- this.removeChildren();
-
- if (this._property.getter) {
- var getterProperty = new WebInspector.RemoteObjectProperty("get", this._property.getter);
- this.appendChild(new this.treeOutline.section.treeElementConstructor(getterProperty));
- }
- if (this._property.setter) {
- var setterProperty = new WebInspector.RemoteObjectProperty("set", this._property.setter);
- this.appendChild(new this.treeOutline.section.treeElementConstructor(setterProperty));
- }
- },
-
- __proto__: TreeElement.prototype
-}
-
-/**
- * @constructor
- * @extends {TreeElement}
* @param {WebInspector.RemoteObject} remoteObject
*/
WebInspector.ScopeTreeElement = function(title, subtitle, remoteObject)
Modified: trunk/Source/WebCore/inspector/front-end/RemoteObject.js (147220 => 147221)
--- trunk/Source/WebCore/inspector/front-end/RemoteObject.js 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/Source/WebCore/inspector/front-end/RemoteObject.js 2013-03-29 15:50:44 UTC (rev 147221)
@@ -215,7 +215,13 @@
var result = [];
for (var i = 0; properties && i < properties.length; ++i) {
var property = properties[i];
- result.push(new WebInspector.RemoteObjectProperty(property.name, null, property));
+ if (property.get || property.set) {
+ if (property.get)
+ result.push(new WebInspector.RemoteObjectProperty("get " + property.name, WebInspector.RemoteObject.fromPayload(property.get), property));
+ if (property.set)
+ result.push(new WebInspector.RemoteObjectProperty("set " + property.name, WebInspector.RemoteObject.fromPayload(property.set), property));
+ } else
+ result.push(new WebInspector.RemoteObjectProperty(property.name, WebInspector.RemoteObject.fromPayload(property.value), property));
}
var internalPropertiesResult;
if (internalProperties) {
@@ -438,24 +444,15 @@
/**
* @constructor
* @param {string} name
- * @param {?WebInspector.RemoteObject} value
+ * @param {WebInspector.RemoteObject} value
* @param {Object=} descriptor
*/
WebInspector.RemoteObjectProperty = function(name, value, descriptor)
{
this.name = name;
+ this.value = value;
this.enumerable = descriptor ? !!descriptor.enumerable : true;
this.writable = descriptor ? !!descriptor.writable : true;
- if (value === null && descriptor) {
- if (descriptor.value)
- this.value = WebInspector.RemoteObject.fromPayload(descriptor.value)
- if (descriptor.get)
- this.getter = WebInspector.RemoteObject.fromPayload(descriptor.get);
- if (descriptor.set)
- this.setter = WebInspector.RemoteObject.fromPayload(descriptor.set);
- } else
- this.value = value;
-
if (descriptor && descriptor.wasThrown)
this.wasThrown = true;
}
Modified: trunk/Source/WebCore/inspector/front-end/inspector.css (147220 => 147221)
--- trunk/Source/WebCore/inspector/front-end/inspector.css 2013-03-29 15:20:38 UTC (rev 147220)
+++ trunk/Source/WebCore/inspector/front-end/inspector.css 2013-03-29 15:50:44 UTC (rev 147221)
@@ -1804,10 +1804,6 @@
color: rgb(118, 15, 21);
}
-.accessor-property-name {
- font-style: italic;
-}
-
.swatch {
margin-left: 1px;
margin-right: 2px;
