Changeset 58412 in webkit

Timestamp:

Apr 28, 2010 10:10:01 AM (14 years ago)

Author:

pfeldman@chromium.org

Message:

2010-04-28 Pavel Feldman <​pfeldman@chromium.org>

Reviewed by Timothy Hatcher.

Web Inspector: Linkify node and function in the event listeners panel.

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

• bindings/js/ScriptEventListener.cpp: (WebCore::eventListenerHandlerBody): (WebCore::eventListenerHandlerLocation):
• bindings/js/ScriptEventListener.h:
• bindings/v8/ScriptEventListener.cpp: (WebCore::eventListenerHandlerBody): (WebCore::eventListenerHandlerLocation):
• bindings/v8/ScriptEventListener.h:
• inspector/InspectorDOMAgent.cpp: (WebCore::InspectorDOMAgent::buildObjectForEventListener):
• inspector/front-end/ElementsPanel.js: (WebInspector.ElementsPanel.prototype.linkifyNodeReference): (WebInspector.ElementsPanel.prototype.linkifyNodeReference.preventDefault):
• inspector/front-end/EventListenersSidebarPane.js: (WebInspector.EventListenersSidebarPane.prototype.update.callback): (WebInspector.EventListenersSidebarPane.prototype.update): ():
• inspector/front-end/StylesSidebarPane.js: (WebInspector.StylesSidebarPane.prototype._rebuildSectionsForStyleRules):
• inspector/front-end/inspector.css: (.node-link):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/ScriptEventListener.cpp (modified) (2 diffs)
• bindings/js/ScriptEventListener.h (modified) (1 diff)
• bindings/v8/ScriptEventListener.cpp (modified) (2 diffs)
• bindings/v8/ScriptEventListener.h (modified) (1 diff)
• inspector/InspectorDOMAgent.cpp (modified) (1 diff)
• inspector/front-end/ElementsPanel.js (modified) (1 diff)
• inspector/front-end/EventListenersSidebarPane.js (modified) (4 diffs)
• inspector/front-end/StylesSidebarPane.js (modified) (2 diffs)
• inspector/front-end/inspector.css (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-28  Pavel Feldman  <pfeldman@chromium.org>
+
+        Reviewed by Timothy Hatcher.
+
+        Web Inspector: Linkify node and function in the event listeners panel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=38251
+
+        * bindings/js/ScriptEventListener.cpp:
+        (WebCore::eventListenerHandlerBody):
+        (WebCore::eventListenerHandlerLocation):
+        * bindings/js/ScriptEventListener.h:
+        * bindings/v8/ScriptEventListener.cpp:
+        (WebCore::eventListenerHandlerBody):
+        (WebCore::eventListenerHandlerLocation):
+        * bindings/v8/ScriptEventListener.h:
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::buildObjectForEventListener):
+        * inspector/front-end/ElementsPanel.js:
+        (WebInspector.ElementsPanel.prototype.linkifyNodeReference):
+        (WebInspector.ElementsPanel.prototype.linkifyNodeReference.preventDefault):
+        * inspector/front-end/EventListenersSidebarPane.js:
+        (WebInspector.EventListenersSidebarPane.prototype.update.callback):
+        (WebInspector.EventListenersSidebarPane.prototype.update):
+        ():
+        * inspector/front-end/StylesSidebarPane.js:
+        (WebInspector.StylesSidebarPane.prototype._rebuildSectionsForStyleRules):
+        * inspector/front-end/inspector.css:
+        (.node-link):
+
 2010-04-28  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/WebCore/bindings/js/ScriptEventListener.cpp

@@ -106 +106 @@
 }
 
-String getEventListenerHandlerBody(ScriptExecutionContext* context, ScriptState* scriptState, EventListener* eventListener)
+String eventListenerHandlerBody(ScriptExecutionContext* context, ScriptState* scriptState, EventListener* eventListener)
 {
     const JSEventListener* jsListener = JSEventListener::cast(eventListener);
@@ -117 +117 @@
 }
 
+bool eventListenerHandlerLocation(ScriptExecutionContext*, ScriptState*, EventListener*, String&, int&)
+{
+    return false;
+}
+
 } // namespace WebCore

trunk/WebCore/bindings/js/ScriptEventListener.h

@@ -46 +46 @@
     PassRefPtr<JSLazyEventListener> createAttributeEventListener(Node*, Attribute*);
     PassRefPtr<JSLazyEventListener> createAttributeEventListener(Frame*, Attribute*);
-    String getEventListenerHandlerBody(ScriptExecutionContext*, ScriptState*, EventListener*);
-
+    String eventListenerHandlerBody(ScriptExecutionContext*, ScriptState*, EventListener*);
+    bool eventListenerHandlerLocation(ScriptExecutionContext*, ScriptState*, EventListener*, String& sourceName, int& lineNumber);
 } // namespace WebCore
 

trunk/WebCore/bindings/v8/ScriptEventListener.cpp

@@ -107 +107 @@
 }
 
-String getEventListenerHandlerBody(ScriptExecutionContext* context, ScriptState* scriptState, EventListener* listener)
+String eventListenerHandlerBody(ScriptExecutionContext* context, ScriptState* scriptState, EventListener* listener)
 {
     if (listener->type() != EventListener::JSEventListenerType)
@@ -121 +121 @@
 }
 
+bool eventListenerHandlerLocation(ScriptExecutionContext* context, ScriptState* scriptState, EventListener* listener, String& sourceName, int& lineNumber)
+{
+    if (listener->type() != EventListener::JSEventListenerType)
+        return false;
+
+    ScriptScope scope(scriptState);
+    V8AbstractEventListener* v8Listener = static_cast<V8AbstractEventListener*>(listener);
+    v8::Handle<v8::Object> object = v8Listener->getListenerObject(context);
+    if (object.IsEmpty() || !object->IsFunction())
+        return false;
+
+    v8::Handle<v8::Function> function = v8::Handle<v8::Function>::Cast(object);
+    v8::ScriptOrigin origin = function->GetScriptOrigin();
+    sourceName = "";
+    lineNumber = 1;
+    if (!origin.ResourceName().IsEmpty()) {
+        sourceName = toWebCoreString(origin.ResourceName());
+        lineNumber = function->GetScriptLineNumber() + 1;
+        return true;
+    }
+    return false;
+}
+
 } // namespace WebCore

trunk/WebCore/bindings/v8/ScriptEventListener.h

@@ -46 +46 @@
     PassRefPtr<V8LazyEventListener> createAttributeEventListener(Node*, Attribute*);
     PassRefPtr<V8LazyEventListener> createAttributeEventListener(Frame*, Attribute*);
-    String getEventListenerHandlerBody(ScriptExecutionContext*, ScriptState*, EventListener*);
+    String eventListenerHandlerBody(ScriptExecutionContext*, ScriptState*, EventListener*);
+    bool eventListenerHandlerLocation(ScriptExecutionContext*, ScriptState*, EventListener*, String& sourceName, int& lineNumber);
 
 } // namespace WebCore

trunk/WebCore/inspector/InspectorDOMAgent.cpp

@@ -629 +629 @@
     value.set("isAttribute", eventListener->isAttribute());
     value.set("nodeId", pushNodePathToFrontend(node));
-    value.set("listener", getEventListenerHandlerBody(node->document(), m_frontend->scriptState(), eventListener.get()));
+    value.set("listenerBody", eventListenerHandlerBody(node->document(), m_frontend->scriptState(), eventListener.get()));
+    String sourceName;
+    int lineNumber;
+    if (eventListenerHandlerLocation(node->document(), m_frontend->scriptState(), eventListener.get(), sourceName, lineNumber)) {
+        value.set("sourceName", sourceName);
+        value.set("lineNumber", lineNumber);
+    }
     return value;
 }

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

@@ -764 +764 @@
     },
 
+    linkifyNodeReference: function(node)
+    {
+        function selectNode(e)
+        {
+            WebInspector.updateFocusedNode(node.id);
+        }
+
+        var link = document.createElement("span");
+        link.className = "node-link";
+        link.addEventListener("click", selectNode, false);
+        this.decorateNodeLabel(node, link);
+        return link;
+    },
+
     updateBreadcrumbSizes: function(focusedCrumb)
     {

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

@@ -78 +78 @@
                 eventListener.node = WebInspector.domAgent.nodeForId(eventListener.nodeId);
                 delete eventListener.nodeId; // no longer needed
-                if (/^function _inspectorCommandLineAPI_logEvent\(/.test(eventListener.listener.toString()))
+                if (/^function _inspectorCommandLineAPI_logEvent\(/.test(eventListener.listenerBody.toString()))
                     continue; // ignore event listeners generated by monitorEvent
                 var type = eventListener.type;
@@ -156 +156 @@
         for (var i = 0; i < length; ++i) {
             var eventListener = filteredEventListeners[i];
-            var eventListenerBar = new WebInspector.EventListenerBar(eventListener);
+            var eventListenerBar = new WebInspector.EventListenerBar(eventListener, this._nodeId);
             if (i < length - 1) {
                 var connector = document.createElement("div");
@@ -175 +175 @@
 WebInspector.EventListenersSection.prototype.__proto__ = WebInspector.PropertiesSection.prototype;
 
-WebInspector.EventListenerBar = function(eventListener)
+WebInspector.EventListenerBar = function(eventListener, nodeId)
 {
     this.eventListener = eventListener;
-    WebInspector.ObjectPropertiesSection.call(this, null, this._getFunctionDisplayName(), this._getNodeDisplayName());
+    this._nodeId = nodeId;
+    WebInspector.ObjectPropertiesSection.call(this);
+    this._setNodeTitle();
+    this._setFunctionSubtitle();
     this.editable = false;
     this.element.className = "event-bar"; /* Changed from "section" */
@@ -200 +203 @@
     },
 
-    _getNodeDisplayName: function()
+    _setNodeTitle: function()
     {
         var node = this.eventListener.node;
         if (!node)
-            return "";
-
-        if (node.nodeType === Node.DOCUMENT_NODE)
-            return "document";
-
-        return appropriateSelectorForNode(node);
-    },
-
-    _getFunctionDisplayName: function()
+            return;
+
+        if (node.nodeType === Node.DOCUMENT_NODE) {
+            this.titleElement.textContent = "document";
+            return;
+        }
+
+        if (node.id === this._nodeId) {
+            this.titleElement.textContent = appropriateSelectorForNode(node);
+            return;
+        }
+
+        this.titleElement.removeChildren();
+        this.titleElement.appendChild(WebInspector.panels.elements.linkifyNodeReference(this.eventListener.node));
+    },
+
+    _setFunctionSubtitle: function()
     {
         // Requires that Function.toString() return at least the function's signature.
-        var match = this.eventListener.listener.toString().match(/function ([^\(]+?)\(/);
-        return (match ? match[1] : WebInspector.UIString("(anonymous function)"));
+        var subtitle = "";
+        var payload = this.eventListener;
+        if (this.eventListener.sourceName) {
+            this.subtitleElement.removeChildren();
+            this.subtitleElement.appendChild(WebInspector.linkifyResourceAsNode(this.eventListener.sourceName, "scripts", this.eventListener.lineNumber));
+        } else {
+            var match = this.eventListener.listenerBody.match(/function ([^\(]+?)\(/);
+            if (match)
+                this.subtitleElement.textContent = match[1];
+            else
+                this.subtitleElement.textContent = WebInspector.UIString("(anonymous function)");
+        }
     }
 }

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

@@ -410 +410 @@
                 separatorElement.className = "styles-sidebar-separator";
                 if (styleRule.node) {
-                    var link = document.createElement("a");
-                    link.href = "";
-                    link.addEventListener("mousedown", this._selectNode.bind(this, styleRule.node.id), false);
-                    WebInspector.panels.elements.decorateNodeLabel(styleRule.node, link);
+                    var link = WebInspector.panels.elements.linkifyNodeReference(styleRule.node);
                     separatorElement.appendChild(document.createTextNode(WebInspector.UIString("Inherited from") + " "));
                     separatorElement.appendChild(link);
@@ -453 +450 @@
         }
         return sections;
-    },
-
-    _selectNode: function(nodeId, e)
-    {
-        WebInspector.updateFocusedNode(nodeId);
-        e.preventDefault();
     },
 

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

@@ -4031 +4031 @@
     padding: 32px;
 }
+
+.node-link {
+    text-decoration: underline;
+    cursor: pointer;
+}