[DevTools] Add removeFunction to EventListener protocol object

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

Index: third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
index 7d0d87ec8b7830811eefec9d7ec6cbed5589c8c0..6d8e1afbe3a7dfa9fa2d435fddf03e03f3d82d84 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorDOMDebuggerAgent.cpp
@@ -72,6 +72,88 @@ static const char xhrBreakpoints[] = "xhrBreakpoints";
 static const char enabled[] = "enabled";
 }
 
+static void removeEventListenerCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
+{
+    v8::Isolate* isolate = info.GetIsolate();
+    v8::Local<v8::Context> context = isolate->GetCurrentContext();
+    v8::Local<v8::Object> data = info.Data().As<v8::Object>();
+
+    v8::Local<v8::Value> v8Target;
+    if (!data->Get(context, v8String(isolate, "target")).ToLocal(&v8Target) || !v8Target->IsObject())
+        return;
+    EventTarget* target = V8EventTarget::toImplWithTypeCheck(isolate, v8Target);
+    // We need to handle LocalDOMWindow specially, because LocalDOMWindow wrapper exists on prototype chain.
+    if (!target)
+        target = toDOMWindow(isolate, v8Target);
+    if (!target || !target->getExecutionContext())
+        return;
+
+    v8::Local<v8::Value> v8Handler;
+    if (!data->Get(context, v8String(isolate, "handler")).ToLocal(&v8Handler) || !v8Handler->IsObject())
+        return;
+    v8::Local<v8::Value> v8Type;
+    if (!data->Get(context, v8String(isolate, "type")).ToLocal(&v8Type) || !v8Type->IsString())
+        return;
+    AtomicString type = AtomicString(toCoreString(v8::Local<v8::String>::Cast(v8Type)));
+    v8::Local<v8::Value> v8UseCapture;
+    if (!data->Get(context, v8String(isolate, "useCapture")).ToLocal(&v8UseCapture) || !v8UseCapture->IsBoolean())
+        return;
+    bool useCapture = v8::Local<v8::Boolean>::Cast(v8UseCapture)->Value();
+
+    EventListener* eventListener = nullptr;
+    Vector<AtomicString> eventTypes = target->eventTypes();
+    for (size_t j = 0; j < eventTypes.size(); ++j) {
+        if (eventTypes[j] != type)
+            continue;
+        EventListenerVector* listeners = target->getEventListeners(eventTypes[j]);

[dgozman, 2016/06/01 23:54:05]

Just getEventListeners(type)

[kozy, 2016/06/02 01:04:39]

Done.

+        if (!listeners)
+            continue;
+        for (size_t k = 0; k < listeners->size(); ++k) {
+            EventListener* current = listeners->at(k).listener();
+            if (current->type() != EventListener::JSEventListenerType)
+                continue;
+            if (listeners->at(k).capture() != useCapture)
+                continue;
+            V8AbstractEventListener* v8Listener = static_cast<V8AbstractEventListener*>(current);

[dgozman, 2016/06/01 23:54:05]

V8AbstractEventListener::cast(current) and check for null.

[kozy, 2016/06/02 01:04:39]

Done.

+            if (!v8Listener->hasExistingListenerObject())
+                continue;
+            if (!v8Listener->getExistingListenerObject()->Equals(context, v8Handler).FromMaybe(false))
+                continue;
+            eventListener = current;
+            break;
+        }
+    }
+    if (!eventListener)
+        return;
+    EventListenerOptions options;
+    options.setCapture(useCapture);
+    target->removeEventListener(type, eventListener, options);
+}
+
+static void returnDataCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
+{
+    info.GetReturnValue().Set(info.Data());
+}
+
+static v8::MaybeLocal<v8::Function> removeFunction(v8::Local<v8::Context> context, v8::Local<v8::Value> object, v8::Local<v8::Object> handler, AtomicString type, bool useCapture)

[dgozman, 2016/06/01 23:54:05]

createRemoveFunction

[kozy, 2016/06/02 01:04:39]

Done.

+{
+    v8::Isolate* isolate = context->GetIsolate();
+    v8::Local<v8::Object> data = v8::Object::New(isolate);
+    if (!data->Set(context, v8String(isolate, "target"), object).FromMaybe(false))
+        return v8::MaybeLocal<v8::Function>();
+    if (!data->Set(context, v8String(isolate, "handler"), handler).FromMaybe(false))
+        return v8::MaybeLocal<v8::Function>();
+    if (!data->Set(context, v8String(isolate, "type"), v8String(isolate, type)).FromMaybe(false))
+        return v8::MaybeLocal<v8::Function>();
+    if (!data->Set(context, v8String(isolate, "useCapture"), v8Boolean(useCapture, isolate)).FromMaybe(false))
+        return v8::MaybeLocal<v8::Function>();
+    v8::Local<v8::Function> removeFunction = v8::Function::New(isolate, removeEventListenerCallback, data);
+    v8::Local<v8::Function> toStringFunction;
+    if (v8::Function::New(context, returnDataCallback, v8String(isolate, "function remove() { [Command Line API] }")).ToLocal(&toStringFunction))
+        removeFunction->Set(v8String(context->GetIsolate(), "toString"), toStringFunction);
+    return removeFunction;
+}
+
 void InspectorDOMDebuggerAgent::eventListenersInfoForTarget(v8::Isolate* isolate, v8::Local<v8::Value> value, V8EventListenerInfoList& eventInformation)
 {
     EventTarget* target = V8EventTarget::toImplWithTypeCheck(isolate, value);
@@ -105,7 +187,8 @@ void InspectorDOMDebuggerAgent::eventListenersInfoForTarget(v8::Isolate* isolate
             v8::Local<v8::Object> handler = v8Listener->getListenerObject(executionContext);
             if (handler.IsEmpty())
                 continue;
-            eventInformation.append(V8EventListenerInfo(type, listeners->at(k).capture(), listeners->at(k).passive(), handler));
+            bool useCapture = listeners->at(k).capture();
+            eventInformation.append(V8EventListenerInfo(type, useCapture, listeners->at(k).passive(), handler, removeFunction(context, value, handler, type, useCapture)));
         }
     }
 }
@@ -390,6 +473,9 @@ std::unique_ptr<protocol::DOMDebugger::EventListener> InspectorDOMDebuggerAgent:
     if (!objectGroupId.isEmpty()) {
         value->setHandler(m_v8Session->wrapObject(context, function, objectGroupId));
         value->setOriginalHandler(m_v8Session->wrapObject(context, info.handler, objectGroupId));
+        v8::Local<v8::Function> removeFunction;
+        if (info.removeFunction.ToLocal(&removeFunction))
+            value->setRemoveFunction(m_v8Session->wrapObject(context, removeFunction, objectGroupId));
     }
     return value;
 }