Changeset 89317 in webkit

Timestamp:

Jun 20, 2011 5:01:18 PM (13 years ago)

Author:

Joseph Pecoraro

Message:

2011-06-20 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Pavel Feldman.

Web Inspector: CRASH if Expanding Event Listener on document
​https://bugs.webkit.org/show_bug.cgi?id=61834

Add a test to list the event listeners in the sidebar.
This test includes event listeners on the document, and
it expands each of the sections which would have caused
the CRASH fixed by this patch.

• http/tests/inspector/elements-test.js: (initialize_ElementTest.InspectorTest.expandAndDumpSelectedElementEventListeners): (initialize_ElementTest.InspectorTest.expandSelectedElementEventListeners): (initialize_ElementTest.InspectorTest.expandSelectedElementEventListenersSubsections): (initialize_ElementTest.InspectorTest.expandSelectedElementEventListenersEventBars): (initialize_ElementTest.InspectorTest.dumpSelectedElementEventListeners): (initialize_ElementTest.InspectorTest.dumpObjectPropertySection):
• inspector/elements/event-listener-sidebar-expected.txt: Added.
• inspector/elements/event-listener-sidebar.html: Added.
• platform/chromium/inspector/elements/event-listener-sidebar-expected.txt: Added. Chromium has slightly different results. It has more properties and includes extra information, like line numbers, for functions.

2011-06-20 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Pavel Feldman.

Web Inspector: CRASH if Expanding Event Listener on document
​https://bugs.webkit.org/show_bug.cgi?id=61834

Node::ownerDocument returns null for a document node. So, in
the case of a document node in resolveNode, use Node::document
which returns the node, as a document.

• inspector/InspectorDOMAgent.cpp: (WebCore::InspectorDOMAgent::resolveNode):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/elements-test.js (modified) (1 diff)
• LayoutTests/inspector/elements/event-listener-sidebar-expected.txt (added)
• LayoutTests/inspector/elements/event-listener-sidebar.html (added)
• LayoutTests/platform/chromium/inspector/elements (added)
• LayoutTests/platform/chromium/inspector/elements/event-listener-sidebar-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorDOMAgent.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-20  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: CRASH if Expanding Event Listener on document
+        https://bugs.webkit.org/show_bug.cgi?id=61834
+
+        Add a test to list the event listeners in the sidebar.
+        This test includes event listeners on the document, and
+        it expands each of the sections which would have caused
+        the CRASH fixed by this patch.
+
+        * http/tests/inspector/elements-test.js:
+        (initialize_ElementTest.InspectorTest.expandAndDumpSelectedElementEventListeners):
+        (initialize_ElementTest.InspectorTest.expandSelectedElementEventListeners):
+        (initialize_ElementTest.InspectorTest.expandSelectedElementEventListenersSubsections):
+        (initialize_ElementTest.InspectorTest.expandSelectedElementEventListenersEventBars):
+        (initialize_ElementTest.InspectorTest.dumpSelectedElementEventListeners):
+        (initialize_ElementTest.InspectorTest.dumpObjectPropertySection):
+        * inspector/elements/event-listener-sidebar-expected.txt: Added.
+        * inspector/elements/event-listener-sidebar.html: Added.
+        * platform/chromium/inspector/elements/event-listener-sidebar-expected.txt: Added.
+        Chromium has slightly different results. It has more properties
+        and includes extra information, like line numbers, for functions.
+
 2011-06-20  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/LayoutTests/http/tests/inspector/elements-test.js

@@ -103 +103 @@
 };
 
+InspectorTest.expandAndDumpSelectedElementEventListeners = function(callback)
+{
+    InspectorTest.expandSelectedElementEventListeners(function() {
+        InspectorTest.dumpSelectedElementEventListeners(callback);
+    });
+}
+
+InspectorTest.expandSelectedElementEventListeners = function(callback)
+{
+    var sidebarPane = WebInspector.panels.elements.sidebarPanes.eventListeners;
+    sidebarPane.expand();
+
+    InspectorTest.runAfterPendingDispatches(function() {
+        InspectorTest.expandSelectedElementEventListenersSubsections(callback);
+    });
+}
+
+InspectorTest.expandSelectedElementEventListenersSubsections = function(callback)
+{
+    var eventListenerSections = WebInspector.panels.elements.sidebarPanes.eventListeners.sections;
+    for (var i = 0; i < eventListenerSections.length; ++i)
+        eventListenerSections[i].expand();
+
+    // Multiple sections may expand.
+    InspectorTest.runAfterPendingDispatches(function() {
+        InspectorTest.expandSelectedElementEventListenersEventBars(callback);
+    });
+}
+
+InspectorTest.expandSelectedElementEventListenersEventBars = function(callback)
+{
+    var eventListenerSections = WebInspector.panels.elements.sidebarPanes.eventListeners.sections;
+    for (var i = 0; i < eventListenerSections.length; ++i) {
+        var eventBarChildren = eventListenerSections[i].eventBars.children;
+        for (var j = 0; j < eventBarChildren.length; ++j)
+            eventBarChildren[j]._section.expand();
+    }
+
+    // Multiple sections may expand.
+    InspectorTest.runAfterPendingDispatches(callback);
+}
+
+InspectorTest.dumpSelectedElementEventListeners = function(callback)
+{
+    var eventListenerSections = WebInspector.panels.elements.sidebarPanes.eventListeners.sections;
+    for (var i = 0; i < eventListenerSections.length; ++i) {
+        var section = eventListenerSections[i];
+        var eventType = section._title;
+        InspectorTest.addResult("");
+        InspectorTest.addResult("======== " + eventType + " ========");
+        var eventBarChildren = section.eventBars.children;
+        for (var j = 0; j < eventBarChildren.length; ++j) {
+            var objectPropertiesSection = eventBarChildren[j]._section;
+            InspectorTest.dumpObjectPropertySection(objectPropertiesSection);
+        }
+    }
+
+    callback();
+}
+
+InspectorTest.dumpObjectPropertySection = function(section)
+{
+    var expandedSubstring = section.expanded ? "[expanded]" : "[collapsed]";
+    InspectorTest.addResult(expandedSubstring + " " + section.titleElement.textContent + " " + section.subtitleAsTextForTest);
+    if (!section.propertiesForTest)
+        return;
+
+    for (var i = 0; i < section.propertiesForTest.length; ++i) {
+        var property = section.propertiesForTest[i];
+        var key = property.name;
+        var value = property.value._description;
+        InspectorTest.addResult("    " + key + ": " + value);
+    }
+}
+
 // FIXME: this returns the first tree item found (may fail for same-named properties in a style).
 InspectorTest.getElementStylePropertyTreeItem = function(propertyName)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-20  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: CRASH if Expanding Event Listener on document
+        https://bugs.webkit.org/show_bug.cgi?id=61834
+
+        Node::ownerDocument returns null for a document node. So, in
+        the case of a document node in resolveNode, use Node::document
+        which returns the node, as a document.
+
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::resolveNode):
+
 2011-06-20  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -1448 +1448 @@
 PassRefPtr<InspectorObject> InspectorDOMAgent::resolveNode(Node* node)
 {
-    Document* document = node->ownerDocument();
+    Document* document = node->isDocumentNode() ? node->document() : node->ownerDocument();
     Frame* frame = document ? document->frame() : 0;
     if (!frame)