Changeset 239987 in webkit

Timestamp:

Jan 15, 2019, 8:31:05 AM (8 years ago)

Author:

Devin Rousso

Message:

Web Inspector: Audit: provide a way to determine whether a give node has event listeners
​https://bugs.webkit.org/show_bug.cgi?id=193226
<rdar://problem/46800005>

Reviewed by Joseph Pecoraro.

Source/WebCore:

Test: inspector/audit/run-dom.html

• inspector/InspectorAuditDOMObject.idl:
• inspector/InspectorAuditDOMObject.h:
• inspector/InspectorAuditDOMObject.cpp:

(WebCore::InspectorAuditDOMObject::hasEventListeners): Added.

LayoutTests:

• inspector/audit/run-dom.html: Added.
• inspector/audit/run-dom-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/audit/run-dom-expected.txt (added)
• LayoutTests/inspector/audit/run-dom.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorAuditDOMObject.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorAuditDOMObject.h (modified) (2 diffs)
• Source/WebCore/inspector/InspectorAuditDOMObject.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-01-15  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Audit: provide a way to determine whether a give node has event listeners
+        https://bugs.webkit.org/show_bug.cgi?id=193226
+        <rdar://problem/46800005>
+
+        Reviewed by Joseph Pecoraro.
+
+        * inspector/audit/run-dom.html: Added.
+        * inspector/audit/run-dom-expected.txt: Added.
+
 2019-01-15  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-01-15  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: Audit: provide a way to determine whether a give node has event listeners
+        https://bugs.webkit.org/show_bug.cgi?id=193226
+        <rdar://problem/46800005>
+
+        Reviewed by Joseph Pecoraro.
+
+        Test: inspector/audit/run-dom.html
+
+        * inspector/InspectorAuditDOMObject.idl:
+        * inspector/InspectorAuditDOMObject.h:
+        * inspector/InspectorAuditDOMObject.cpp:
+        (WebCore::InspectorAuditDOMObject::hasEventListeners): Added.
+
 2019-01-15  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/inspector/InspectorAuditDOMObject.cpp

@@ -28 +28 @@
 #include "InspectorAuditDOMObject.h"
 
+#include "Node.h"
+#include <wtf/text/AtomicString.h>
+#include <wtf/text/WTFString.h>
+
 namespace WebCore {
 
 using namespace Inspector;
 
-InspectorAuditDOMObject::InspectorAuditDOMObject()
+#define ERROR_IF_NO_ACTIVE_AUDIT() \
+    if (!m_auditAgent.hasActiveAudit()) \
+        return Exception { NotAllowedError, "Cannot be called outside of a Web Inspector Audit"_s };
+
+InspectorAuditDOMObject::InspectorAuditDOMObject(InspectorAuditAgent& auditAgent)
+    : m_auditAgent(auditAgent)
 {
 }
 
+ExceptionOr<bool> InspectorAuditDOMObject::hasEventListeners(Node& node, const String& type)
+{
+    ERROR_IF_NO_ACTIVE_AUDIT();
+
+    if (EventTargetData* eventTargetData = node.eventTargetData()) {
+        Vector<AtomicString> eventTypes;
+        if (type.isNull())
+            eventTypes = eventTargetData->eventListenerMap.eventTypes();
+        else
+            eventTypes.append(type);
+
+        for (AtomicString& type : eventTypes) {
+            for (const RefPtr<RegisteredEventListener>& listener : node.eventListeners(type)) {
+                if (listener->callback().type() == EventListener::JSEventListenerType)
+                    return true;
+            }
+        }
+    }
+
+    return false;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/inspector/InspectorAuditDOMObject.h

@@ -26 +26 @@
 #pragma once
 
+#include "ExceptionOr.h"
 #include <JavaScriptCore/InspectorAuditAgent.h>
 #include <wtf/Ref.h>
@@ -32 +33 @@
 namespace WebCore {
 
+class Node;
+
 class InspectorAuditDOMObject : public RefCounted<InspectorAuditDOMObject> {
 public:
-    static Ref<InspectorAuditDOMObject> create(Inspector::InspectorAuditAgent&)
+    static Ref<InspectorAuditDOMObject> create(Inspector::InspectorAuditAgent& auditAgent)
     {
-        return adoptRef(*new InspectorAuditDOMObject());
+        return adoptRef(*new InspectorAuditDOMObject(auditAgent));
     }
 
+    ExceptionOr<bool> hasEventListeners(Node&, const String& type);
+
 private:
-    explicit InspectorAuditDOMObject();
+    explicit InspectorAuditDOMObject(Inspector::InspectorAuditAgent&);
+
+    Inspector::InspectorAuditAgent& m_auditAgent;
 };
 

trunk/Source/WebCore/inspector/InspectorAuditDOMObject.idl

@@ -29 +29 @@
     NoInterfaceObject,
 ] interface InspectorAuditDOMObject {
+    [MayThrowException] boolean hasEventListeners(Node node, optional DOMString type);
 };