Add the ability to return descedant event listeners.

third_party/WebKit/Source/core/inspector/ThreadDebugger.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/inspector/ThreadDebugger.h"
 
 #include "bindings/core/v8/ScriptCallStack.h"
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8DOMException.h"
@@ skipping 280 matching lines @@
 void ThreadDebugger::getEventListenersCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     if (info.Length() < 1)
         return;
 
     ThreadDebugger* debugger = static_cast<ThreadDebugger*>(v8::Local<v8::External>::Cast(info.Data())->Value());
     DCHECK(debugger);
     v8::Isolate* isolate = info.GetIsolate();
     v8::Local<v8::Context> context = isolate->GetCurrentContext();
 
+    EventListenerFilter filterMask = EventListenerFilter::ShowPassive | EventListenerFilter::ShowBlocking;
+    if (info.Length() > 1 && info[1]->IsObject()) {
+        v8::Local<v8::Object> options = v8::Local<v8::Object>::Cast(info[1]);
+
+        v8::Local<v8::Value> setting;
+        if (options->Get(context, v8String(isolate, "descendants")).ToLocal(&setting) && setting->IsTrue())
+            filterMask |= EventListenerFilter::ShowDescendants;
+
+        if (options->Get(context, v8String(isolate, "passive")).ToLocal(&setting) && !setting->IsUndefined()) {
+            if (setting->IsFalse())
+                filterMask &= ~EventListenerFilter::ShowPassive;
+            else
+                filterMask &= ~EventListenerFilter::ShowBlocking;
+        }
+    }
+
     V8EventListenerInfoList listenerInfo;
     // eventListeners call can produce message on ErrorEvent during lazy event listener compilation.
     debugger->muteWarningsAndDeprecations();
-    InspectorDOMDebuggerAgent::eventListenersInfoForTarget(isolate, info[0], listenerInfo);
+    InspectorDOMDebuggerAgent::eventListenersInfoForTarget(isolate, info[0], filterMask, listenerInfo);

[pfeldman, 2016/05/27 21:54:01]

We should not mix data from different worlds in the same object, binding should
only list listeners that are local to the execution context.

[dtapuska, 2016/05/27 22:12:39]

Yes there is a check inside the query. Is there something wrong with this code?

[pfeldman, 2016/05/27 22:32:12]

We want InspectorDOMDebuggerAgent::eventListenersInfoForTarget to report all the
listeners, cross the iframe boundary and not do the security checks. Security
checks should be placed here instead.

[dtapuska, 2016/05/31 21:26:07]

Can you be more explicit of which security checks? I've added based on creation
context; but I expect that is not what you mean.

     debugger->unmuteWarningsAndDeprecations();
 
     v8::Local<v8::Object> result = v8::Object::New(isolate);
 
     v8::Local<v8::Function> removeFunc = v8::Function::New(isolate, removeEventListenerCallback, info[0]);
     v8::Local<v8::Function> toStringFunction;
     if (v8::Function::New(context, returnDataCallback, v8String(isolate, "function remove() { [Command Line API] }")).ToLocal(&toStringFunction))
         removeFunc->Set(v8String(context->GetIsolate(), "toString"), toStringFunction);
 
     AtomicString currentEventType;
     v8::Local<v8::Array> listeners;
     size_t outputIndex = 0;
     for (auto& info : listenerInfo) {
         if (currentEventType != info.eventType) {
             currentEventType = info.eventType;
-            listeners = v8::Array::New(isolate);
-            outputIndex = 0;
-            result->Set(v8String(isolate, currentEventType), listeners);
+            v8::Local<v8::Value> matchingList;
+            if (result->Get(context, v8String(isolate, currentEventType)).ToLocal(&matchingList) && matchingList->IsArray()) {
+                listeners = v8::Local<v8::Array>::Cast(matchingList);
+                outputIndex = listeners->Length();
+            } else {
+                listeners = v8::Array::New(isolate);
+                outputIndex = 0;
+                result->Set(v8String(isolate, currentEventType), listeners);
+            }
         }
 
         v8::Local<v8::Object> listenerObject = v8::Object::New(isolate);
         listenerObject->Set(v8String(isolate, "listener"), info.handler);
         listenerObject->Set(v8String(isolate, "useCapture"), v8::Boolean::New(isolate, info.useCapture));
         listenerObject->Set(v8String(isolate, "passive"), v8::Boolean::New(isolate, info.passive));
         listenerObject->Set(v8String(isolate, "type"), v8String(isolate, currentEventType));
         listenerObject->Set(v8String(isolate, "remove"), removeFunc);
         listeners->Set(outputIndex++, listenerObject);
     }
@@ skipping 57 matching lines @@
 {
     for (size_t index = 0; index < m_timers.size(); ++index) {
         if (m_timers[index] == timer) {
             m_timerCallbacks[index](m_timerData[index]);
             return;
         }
     }
 }
 
 } // namespace blink