[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[pfeldman at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 68ec544c03d0a68f3d656b4b671c39b80d32b2d3
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 28 14:40:17 2009 +0000

    2009-09-28  Pavel Feldman  <pfeldman at 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):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48813 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5a34608..c2ac3f3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2009-09-28  Pavel Feldman  <pfeldman at 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 at gmail.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebCore/inspector/front-end/EventListenersSidebarPane.js b/WebCore/inspector/front-end/EventListenersSidebarPane.js
index a593cb8..55b8e55 100644
--- a/WebCore/inspector/front-end/EventListenersSidebarPane.js
+++ b/WebCore/inspector/front-end/EventListenersSidebarPane.js
@@ -69,13 +69,12 @@ WebInspector.EventListenersSidebarPane.prototype = {
             var sectionMap = {};
             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
                 var type = eventListener.type;
                 var section = sectionMap[type];
                 if (!section) {
-                    section = new WebInspector.EventListenersSection(type);
+                    section = new WebInspector.EventListenersSection(type, nodeId);
                     sectionMap[type] = section;
                     sectionNames.push(type);
                     self.sections.push(section);
@@ -116,10 +115,11 @@ WebInspector.EventListenersSidebarPane.prototype = {
 
 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
     this.propertiesElement.parentNode.removeChild(this.propertiesElement);
@@ -140,7 +140,7 @@ WebInspector.EventListenersSection.prototype = {
             filteredEventListeners = [];
             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);
             }
         }
@@ -171,12 +171,28 @@ WebInspector.EventListenersSection.prototype.__proto__ = WebInspector.Properties
 WebInspector.EventListenerBar = function(eventListener)
 {
     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" */
 }
 
 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()
     {
         var node = this.eventListener.node;

-- 
WebKit Debian packaging