Changeset 48813 in webkit

Timestamp:

Sep 28, 2009 7:40:17 AM (15 years ago)

Author:

pfeldman@chromium.org

Message:

2009-09-28 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by nobody (trivial follow up fix), Joseph Pecoraro LGTM-ed.

Web Inspector: Follow up to r48809.
InspectorController.wrapObject should only be called on the inspectable page side.

​https://bugs.webkit.org/show_bug.cgi?id=17429

• inspector/front-end/EventListenersSidebarPane.js: (WebInspector.EventListenersSidebarPane.prototype.update.callback): (WebInspector.EventListenersSidebarPane.prototype.update): (WebInspector.EventListenersSection): (WebInspector.EventListenersSection.prototype.update): (WebInspector.EventListenerBar): (WebInspector.EventListenerBar.prototype.update):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/EventListenersSidebarPane.js (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-28  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by nobody (trivial follow up fix), Joseph Pecoraro LGTM-ed.
+
+        Web Inspector: Follow up to r48809.
+        InspectorController.wrapObject should only be called on the inspectable page side.
+
+        https://bugs.webkit.org/show_bug.cgi?id=17429
+
+        * inspector/front-end/EventListenersSidebarPane.js:
+        (WebInspector.EventListenersSidebarPane.prototype.update.callback):
+        (WebInspector.EventListenersSidebarPane.prototype.update):
+        (WebInspector.EventListenersSection):
+        (WebInspector.EventListenersSection.prototype.update):
+        (WebInspector.EventListenerBar):
+        (WebInspector.EventListenerBar.prototype.update):
+
 2009-09-28  Jakub Wieczorek  <faw217@gmail.com>
 

trunk/WebCore/inspector/front-end/EventListenersSidebarPane.js

@@ -70 +70 @@
             for (var i = 0; i < eventListeners.length; ++i) {
                 var eventListener = eventListeners[i];
-                eventListener._selectedNode = (eventListener.nodeId === nodeId);
                 eventListener.node = WebInspector.domAgent.nodeForId(eventListener.nodeId);
                 delete eventListener.nodeId; // no longer needed
@@ -76 +75 @@
                 var section = sectionMap[type];
                 if (!section) {
-                    section = new WebInspector.EventListenersSection(type);
+                    section = new WebInspector.EventListenersSection(type, nodeId);
                     sectionMap[type] = section;
                     sectionNames.push(type);
@@ -117 +116 @@
 WebInspector.EventListenersSidebarPane.prototype.__proto__ = WebInspector.SidebarPane.prototype;
 
-WebInspector.EventListenersSection = function(title, subtitle)
+WebInspector.EventListenersSection = function(title, nodeId)
 {
     this.eventListeners = [];
-    WebInspector.PropertiesSection.call(this, title, subtitle);
+    this._nodeId = nodeId;
+    WebInspector.PropertiesSection.call(this, title);
 
     // Changed from a Properties List
@@ -141 +141 @@
             for (var i = 0; i < this.eventListeners.length; ++i) {
                 var eventListener = this.eventListeners[i];
-                if (eventListener._selectedNode)
+                if (eventListener.node.id === this._nodeId)
                     filteredEventListeners.push(eventListener);
             }
@@ -172 +172 @@
 {
     this.eventListener = eventListener;
-    WebInspector.ObjectPropertiesSection.call(this, InspectorController.wrapObject(eventListener), this._getFunctionDisplayName(), this._getNodeDisplayName());
+    WebInspector.ObjectPropertiesSection.call(this, null, this._getFunctionDisplayName(), this._getNodeDisplayName());
+    this.editable = false;
     this.element.className = "event-bar"; /* Changed from "section" */
     this.propertiesElement.className = "event-properties"; /* Changed from "properties" */
@@ -178 +179 @@
 
 WebInspector.EventListenerBar.prototype = {
+    update: function()
+    {
+        var properties = [];
+        for (var propertyName in this.eventListener) {
+            // Just build properties in place - no need to reach out for injected script.
+            var value = this.eventListener[propertyName];
+            if (value instanceof WebInspector.DOMNode)
+                value = new WebInspector.ObjectProxy(value.id, [], 0, appropriateSelectorForNode(value), true);
+            else
+                value = WebInspector.ObjectProxy.wrapPrimitiveValue(value);
+            properties.push(new WebInspector.ObjectPropertyProxy(propertyName, value));
+        }
+        this.updateProperties(properties);
+    },
+
     _getNodeDisplayName: function()
     {