Changeset 92671 in webkit

Timestamp:

Aug 9, 2011 3:26:02 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r92670.
​http://trac.webkit.org/changeset/92670
​https://bugs.webkit.org/show_bug.cgi?id=65905

It broke 3 inspector tests (Requested by Ossy on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-08-09

Source/WebCore:

• inspector/InjectedScript.cpp:

(WebCore::InjectedScript::getProperties):

• inspector/InjectedScript.h:
• inspector/InjectedScriptSource.js:

(.):

• inspector/Inspector.json:
• inspector/InspectorRuntimeAgent.cpp:

(WebCore::InspectorRuntimeAgent::getProperties):

• inspector/InspectorRuntimeAgent.h:
• inspector/front-end/ObjectPropertiesSection.js:

(WebInspector.ObjectPropertyTreeElement.prototype.ondblclick):
(WebInspector.ObjectPropertyTreeElement.prototype.update):

• inspector/front-end/RemoteObject.js:

(WebInspector.RemoteObject.prototype.getOwnProperties):
(WebInspector.RemoteObject.prototype.getAllProperties):
(WebInspector.RemoteObject.prototype._getProperties.remoteObjectBinder):
(WebInspector.RemoteObject.prototype._getProperties):
(WebInspector.RemoteObjectProperty):

• inspector/front-end/inspector.css:

(.section .properties .value.dimmed):

LayoutTests:

• inspector/protocol/runtime-agent-expected.txt:
• inspector/runtime/runtime-getProperties-expected.txt:
• inspector/runtime/runtime-getProperties.html:
• platform/chromium/inspector/runtime/runtime-getProperties-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/protocol/runtime-agent-expected.txt (modified) (3 diffs)
• LayoutTests/inspector/runtime/runtime-getProperties-expected.txt (modified) (3 diffs)
• LayoutTests/inspector/runtime/runtime-getProperties.html (modified) (1 diff)
• LayoutTests/platform/chromium/inspector/runtime/runtime-getProperties-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InjectedScript.cpp (modified) (1 diff)
• Source/WebCore/inspector/InjectedScript.h (modified) (1 diff)
• Source/WebCore/inspector/InjectedScriptSource.js (modified) (4 diffs)
• Source/WebCore/inspector/Inspector.json (modified) (2 diffs)
• Source/WebCore/inspector/InspectorRuntimeAgent.cpp (modified) (2 diffs)
• Source/WebCore/inspector/InspectorRuntimeAgent.h (modified) (1 diff)
• Source/WebCore/inspector/front-end/ObjectPropertiesSection.js (modified) (2 diffs)
• Source/WebCore/inspector/front-end/RemoteObject.js (modified) (3 diffs)
• Source/WebCore/inspector/front-end/inspector.css (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-09  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r92670.
+        http://trac.webkit.org/changeset/92670
+        https://bugs.webkit.org/show_bug.cgi?id=65905
+
+        It broke 3 inspector tests (Requested by Ossy on #webkit).
+
+        * inspector/protocol/runtime-agent-expected.txt:
+        * inspector/runtime/runtime-getProperties-expected.txt:
+        * inspector/runtime/runtime-getProperties.html:
+        * platform/chromium/inspector/runtime/runtime-getProperties-expected.txt: Added.
+
 2011-08-09  Pavel Feldman  <pfeldman@google.com>
 

trunk/LayoutTests/inspector/protocol/runtime-agent-expected.txt

@@ -168 +168 @@
     params : {
         objectId : <string>
-        ownProperties : false
+        ignoreHasOwnProperty : false
     }
     id : <number>
@@ -178 +178 @@
         result : [
             {
+                name : "assignedByCallFunctionOn"
                 value : {
                     type : "string"
                     value : "callFunctionOn function works fine"
                 }
-                writable : true
-                enumerable : true
-                configurable : true
-                name : "assignedByCallFunctionOn"
             }
             {
+                name : "self"
                 value : {
                     type : "object"
@@ -194 +192 @@
                     description : "TestObject"
                 }
-                writable : true
-                enumerable : true
-                configurable : true
-                name : "self"
+            }
+            {
+                name : "__proto__"
+                value : {
+                    type : "object"
+                    objectId : <string>
+                    className : <string>
+                    description : "TestObject"
+                }
             }
         ]

trunk/LayoutTests/inspector/runtime/runtime-getProperties-expected.txt

@@ -10 +10 @@
         type : "function"
         description : "function () { return 1; }"
-        objectId : <string>
     }
-    enumerable : true
-    writable : false
 }
 {
@@ -20 +17 @@
         type : "function"
         description : "function (value) { }"
-        objectId : <string>
     }
-    enumerable : true
-    writable : false
 }
 
@@ -32 +26 @@
         type : "function"
         description : "function () { return 1; }"
-        objectId : <string>
     }
-    enumerable : true
-    writable : false
 }
 

trunk/LayoutTests/inspector/runtime/runtime-getProperties.html

@@ -66 +66 @@
             return;
 
-        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: true });
+        var propertyObj = {};
+        propertyObj.name = property.name;
+        propertyObj.value = {};
+        propertyObj.value.type = property.value.type;
+        propertyObj.value.description = property.value.description;
+
+        InspectorTest.dump(propertyObj);
     }
 }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-09  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r92670.
+        http://trac.webkit.org/changeset/92670
+        https://bugs.webkit.org/show_bug.cgi?id=65905
+
+        It broke 3 inspector tests (Requested by Ossy on #webkit).
+
+        * inspector/InjectedScript.cpp:
+        (WebCore::InjectedScript::getProperties):
+        * inspector/InjectedScript.h:
+        * inspector/InjectedScriptSource.js:
+        (.):
+        * inspector/Inspector.json:
+        * inspector/InspectorRuntimeAgent.cpp:
+        (WebCore::InspectorRuntimeAgent::getProperties):
+        * inspector/InspectorRuntimeAgent.h:
+        * inspector/front-end/ObjectPropertiesSection.js:
+        (WebInspector.ObjectPropertyTreeElement.prototype.ondblclick):
+        (WebInspector.ObjectPropertyTreeElement.prototype.update):
+        * inspector/front-end/RemoteObject.js:
+        (WebInspector.RemoteObject.prototype.getOwnProperties):
+        (WebInspector.RemoteObject.prototype.getAllProperties):
+        (WebInspector.RemoteObject.prototype._getProperties.remoteObjectBinder):
+        (WebInspector.RemoteObject.prototype._getProperties):
+        (WebInspector.RemoteObjectProperty):
+        * inspector/front-end/inspector.css:
+        (.section .properties .value.dimmed):
+
 2011-08-09  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/inspector/InjectedScript.cpp

@@ -86 +86 @@
 }
 
-void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<InspectorArray>* properties)
+void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ignoreHasOwnProperty, RefPtr<InspectorArray>* properties)
 {
     ScriptFunctionCall function(m_injectedScriptObject, "getProperties");
     function.appendArgument(objectId);
-    function.appendArgument(ownProperties);
+    function.appendArgument(ignoreHasOwnProperty);
 
     RefPtr<InspectorValue> result;

trunk/Source/WebCore/inspector/InjectedScript.h

@@ -71 +71 @@
                         bool* wasThrown);
     void evaluateOnCallFrame(ErrorString*, const ScriptValue& callFrames, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, RefPtr<InspectorObject>* result, bool* wasThrown);
-    void getProperties(ErrorString*, const String& objectId, bool ownProperties, RefPtr<InspectorArray>* result);
+    void getProperties(ErrorString*, const String& objectId, bool ignoreHasOwnProperty, RefPtr<InspectorArray>* result);
     Node* nodeForObjectId(const String& objectId);
     void releaseObject(const String& objectId);

trunk/Source/WebCore/inspector/InjectedScriptSource.js

@@ -1 @@
-  /*
+/*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
@@ -166 +166 @@
     },
 
-    getProperties: function(objectId, ownProperties)
+    getProperties: function(objectId, ignoreHasOwnProperty)
     {
         var parsedObjectId = this._parseObjectId(objectId);
@@ -174 +174 @@
         if (!this._isDefined(object))
             return false;
-        var descriptors = [];
-        this._populatePropertyDescriptors(object, descriptors, ownProperties);
-
-        // Go over properties, wrap object values.
-        for (var i = 0; i < descriptors.length; ++i) {
-            var descriptor = descriptors[i];
-            if (descriptor.get)
-                descriptor.get = this._wrapObject(descriptor.get, objectGroupName);
-            if (descriptor.set)
-                descriptor.set = this._wrapObject(descriptor.set, objectGroupName);
-            if ("value" in descriptor)
-                descriptor.value = this._wrapObject(descriptor.value, objectGroupName);
-        }
-        return descriptors;
+        var properties = [];
+
+        var propertyNames = ignoreHasOwnProperty ? this._getPropertyNames(object) : Object.getOwnPropertyNames(object);
+        if (!ignoreHasOwnProperty && object.__proto__)
+            propertyNames.push("__proto__");
+
+        // Go over properties, prepare results.
+        for (var i = 0; i < propertyNames.length; ++i) {
+            var propertyName = propertyNames[i];
+
+            var getter = (typeof object["__lookupGetter__"] === "function") && object.__lookupGetter__(propertyName);
+            var setter = (typeof object["__lookupSetter__"] === "function") && object.__lookupSetter__(propertyName);
+            if (getter || setter) {
+                if (getter) {
+                    var property = {};
+                    property.name = "get " + propertyName;
+                    property.value = this._wrapObject(getter, objectGroupName);
+                    properties.push(property);
+                }
+                if (setter) {
+                    var property = {};
+                    property.name = "set " + propertyName;
+                    property.value = this._wrapObject(setter, objectGroupName);
+                    properties.push(property);
+                }
+            } else {
+                var property = {};
+                property.name = propertyName;
+                var value;
+                try {
+                    value = object[propertyName];
+                } catch(e) {
+                    var value = e;
+                    property.wasThrown = true;
+                }
+                property.value = this._wrapObject(value, objectGroupName);
+                properties.push(property);
+            }
+        }
+        return properties;
     },
 
@@ -202 +228 @@
     },
 
-    _populatePropertyDescriptors: function(object, descriptors, ownProperties)
-    {
-        var nameProcessed = {};
-        nameProcessed.__proto__ = null;
-        for (var o = object; this._isDefined(o); o = o.__proto__) {
-            var names = Object.getOwnPropertyNames(o);
-            for (var i = 0; i < names.length; ++i) {
-                var name = names[i];
-                if (nameProcessed[name])
-                    continue;
-
-                try {
-                    nameProcessed[name] = true;
-                    var descriptor = Object.getOwnPropertyDescriptor(object, name);
-                    if (!descriptor)
-                        continue;
-                } catch (e) {
-                    var descriptor = {};
-                    descriptor.value = e;
-                    descriptor.wasThrown = true;
-                }
-
-                descriptor.name = name;
-                descriptors.push(descriptor); 
+    _populatePropertyNames: function(object, resultSet)
+    {
+        for (var o = object; o; o = o.__proto__) {
+            try {
+                var names = Object.getOwnPropertyNames(o);
+                for (var i = 0; i < names.length; ++i)
+                    resultSet[names[i]] = true;
+            } catch (e) {
             }
-            if (ownProperties) {
-                if (object.__proto__)
-                    descriptors.push({ name: "__proto__", value: object.__proto__, writable: true, configurable: true, enumerable: false});
-                break;
-            }
-        }
+        }
+    },
+
+    _getPropertyNames: function(object, resultSet)
+    {
+        var propertyNameSet = {};
+        this._populatePropertyNames(object, propertyNameSet);
+        return Object.keys(propertyNameSet);
     },
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -237 +237 @@
             },
             {
-                "id": "PropertyDescriptor",
-                "type": "object",
-                "description": "Object property descriptor.",
-                "properties": [
-                    { "name": "value", "$ref": "RemoteObject", "description": "The value associated with the property." },
-                    { "name": "writable", "type": "boolean", "description": "True iff the value associated with the property may be changed (data descriptors only)." },
-                    { "name": "get", "$ref": "RemoteObject", "description": "A function which serves as a getter for the property, or <code>undefined</code> if there is no getter (accessor descriptors only)." },
-                    { "name": "set", "$ref": "RemoteObject", "description": "A function which serves as a setter for the property, or <code>undefined</code> if there is no setter (accessor descriptors only)." },
-                    { "name": "configurable", "type": "boolean", "description": "True iff the type of this property descriptor may be changed and if the property may be deleted from the corresponding object." },
-                    { "name": "enumerable", "type": "boolean", "description": "True iff this property shows up during enumeration of the properties on the corresponding object." }
+                "id": "RemoteProperty",
+                "type": "object",
+                "description": "Mirror object property.",
+                "properties": [
+                    { "name": "name", "type": "string", "description": "Property name." },
+                    { "name": "value", "$ref": "RemoteObject", "description": "Property value." },
+                    { "name": "wasThrown", "type": "boolean", "optional": true, "description": "True if exception was thrown on attempt to get the property value, in that case the value propery will contain thrown value." }
                 ]
             },
@@ -294 +291 @@
                 "parameters": [
                     { "name": "objectId", "$ref": "RemoteObjectId", "description": "Identifier of the object to return properties for." },
-                    { "name": "ownProperties", "optional": true, "type": "boolean", "description": "If true, returns properties belonging only to the element itself, not to its prototype chain." }
-                ],
-                "returns": [
-                    { "name": "result", "type": "array", "items": { "$ref": "PropertyDescriptor"}, "description": "Object properties." }
+                    { "name": "ignoreHasOwnProperty", "type": "boolean", "description": "If true, returns properties belonging to any element of the prototype chain." }
+                ],
+                "returns": [
+                    { "name": "result", "type": "array", "items": { "$ref": "RemoteProperty"}, "description": "Object properties." }
                 ],
                 "description": "Returns properties of a given object."

trunk/Source/WebCore/inspector/InspectorRuntimeAgent.cpp

@@ -110 +110 @@
 }
 
-void InspectorRuntimeAgent::getProperties(ErrorString* errorString, const String& objectId, const bool* const ownProperties, RefPtr<InspectorArray>* result)
+void InspectorRuntimeAgent::getProperties(ErrorString* errorString, const String& objectId, bool ignoreHasOwnProperty, RefPtr<InspectorArray>* result)
 {
     InjectedScript injectedScript = m_injectedScriptManager->injectedScriptForObjectId(objectId);
@@ -117 +117 @@
         return;
     }
-    injectedScript.getProperties(errorString, objectId, ownProperties ? *ownProperties : false, result);
+    injectedScript.getProperties(errorString, objectId, ignoreHasOwnProperty, result);
 }
 

trunk/Source/WebCore/inspector/InspectorRuntimeAgent.h

@@ -71 +71 @@
                         bool* wasThrown);
     void releaseObject(ErrorString*, const String& objectId);
-    void getProperties(ErrorString*, const String& objectId, const bool* const ownProperties, RefPtr<InspectorArray>* result);
+    void getProperties(ErrorString*, const String& objectId, bool ignoreHasOwnProperty, RefPtr<InspectorArray>* result);
     void releaseObjectGroup(ErrorString*, const String& objectGroup);
 

trunk/Source/WebCore/inspector/front-end/ObjectPropertiesSection.js

@@ -167 +167 @@
     ondblclick: function(event)
     {
-        if (this.property.writable)
-            this.startEditing();
+        this.startEditing();
     },
 
@@ -181 +180 @@
         this.nameElement.className = "name";
         this.nameElement.textContent = this.property.name;
-        if (!this.property.enumerable)
-            this.nameElement.addStyleClass("dimmed");
 
         var separatorElement = document.createElement("span");

trunk/Source/WebCore/inspector/front-end/RemoteObject.js

@@ -117 +117 @@
     getOwnProperties: function(callback)
     {
+        this._getProperties(false, callback);
+    },
+
+    getAllProperties: function(callback)
+    {
         this._getProperties(true, callback);
     },
 
-    getAllProperties: function(callback)
-    {
-        this._getProperties(false, callback);
-    },
-
-    _getProperties: function(ownProperties, callback)
+    _getProperties: function(ignoreHasOwnProperty, callback)
     {
         if (!this._objectId) {
@@ -137 +137 @@
                 return;
             }
-            var result = [];
-            for (var i = 0; properties && i < properties.length; ++i) {
-                var property = properties[i];
-                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));
-            }
-            callback(result);
-        }
-        RuntimeAgent.getProperties(this._objectId, ownProperties, remoteObjectBinder);
+            for (var i = 0; properties && i < properties.length; ++i)
+                properties[i].value = WebInspector.RemoteObject.fromPayload(properties[i].value);
+            callback(properties);
+        }
+        RuntimeAgent.getProperties(this._objectId, !!ignoreHasOwnProperty, remoteObjectBinder);
     },
 
@@ -223 +214 @@
 }
 
-WebInspector.RemoteObjectProperty = function(name, value, descriptor)
+WebInspector.RemoteObjectProperty = function(name, value)
 {
     this.name = name;
     this.value = value;
-    this.enumerable = descriptor ? !!descriptor.enumerable : true;
-    this.writable = descriptor ? !!descriptor.writable : true;
-    if (descriptor && descriptor.wasThrown)
-        this.wasThrown = true; 
 }
 

trunk/Source/WebCore/inspector/front-end/inspector.css

@@ -1635 +1635 @@
 }
 
-.section .properties .dimmed {
-    opacity: 0.6;
+.section .properties .value.dimmed {
+    color: rgb(100, 100, 100);
 }