Add counters for add/removeEventListener() called with one argument

Source/bindings/core/v8/custom/V8EventTargetCustom.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "bindings/core/v8/V8EventTarget.h"
 
 #include "bindings/core/v8/BindingSecurity.h"
 #include "bindings/core/v8/V8EventListenerList.h"
 #include "core/frame/LocalDOMWindow.h"
+#include "core/frame/UseCounter.h"
 
 namespace blink {
 
 static void addEventListenerMethodEpilogue(const v8::FunctionCallbackInfo<v8::Value>& info, EventTarget* impl)
 {
     if (info.Length() >= 2 && info[1]->IsObject() && !impl->toNode())
         addHiddenValueToArray(info.GetIsolate(), info.Holder(), info[1], V8EventTarget::eventListenerCacheIndex);
 }
 
 void V8EventTarget::addEventListenerMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     ExceptionState exceptionState(ExceptionState::ExecutionContext, "addEventListener", "EventTarget", info.Holder(), info.GetIsolate());
+    if (UNLIKELY(info.Length() < 2)) {
+        // TODO(philipj): Remove the custom bindings when usage allows. The
+        // generated bindings would thrown here instead. crbug.com/353484
+        UseCounter::countIfNotPrivateScript(info.GetIsolate(), callingExecutionContext(info.GetIsolate()),
+            info.Length() == 0 ? UseCounter::AddEventListenerNoArguments : UseCounter::AddEventListenerOneArgument);
+        return;
+    }
     EventTarget* impl = V8EventTarget::toImpl(info.Holder());
     if (LocalDOMWindow* window = impl->toDOMWindow()) {
         if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), window->frame(), exceptionState)) {
             exceptionState.throwIfNeeded();
             return;
         }
         if (!window->document())
             return;
     }
     V8StringResource<TreatNullAsNullString> type;
     RefPtr<EventListener> listener;
     bool capture;
     {
-        if (UNLIKELY(info.Length() <= 0)) {
-            impl->addEventListener();
-            addEventListenerMethodEpilogue(info, impl);
-            return;
-        }
         type = info[0];
         if (!type.prepare())
             return;
         listener = V8EventListenerList::getEventListener(ScriptState::current(info.GetIsolate()), info[1], false, ListenerFindOrCreate);
-        if (UNLIKELY(info.Length() <= 2)) {
-            impl->addEventListener(type, listener);
-            addEventListenerMethodEpilogue(info, impl);
-            return;
-        }
         capture = toBoolean(info.GetIsolate(), info[2], exceptionState);
         if (exceptionState.throwIfNeeded())
             return;
     }
     impl->addEventListener(type, listener, capture);
     addEventListenerMethodEpilogue(info, impl);
 }
 
 static void removeEventListenerMethodEpilogue(const v8::FunctionCallbackInfo<v8::Value>& info, EventTarget* impl)
 {
     if (info.Length() >= 2 && info[1]->IsObject() && !impl->toNode())
         removeHiddenValueFromArray(info.GetIsolate(), info.Holder(), info[1], V8EventTarget::eventListenerCacheIndex);
 }
 
 void V8EventTarget::removeEventListenerMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     ExceptionState exceptionState(ExceptionState::ExecutionContext, "removeEventListener", "EventTarget", info.Holder(), info.GetIsolate());
+    if (UNLIKELY(info.Length() < 2)) {
+        // TODO(philipj): Remove the custom bindings when usage allows. The
+        // generated bindings would thrown here instead. crbug.com/353484
+        UseCounter::countIfNotPrivateScript(info.GetIsolate(), callingExecutionContext(info.GetIsolate()),
+            info.Length() == 0 ? UseCounter::RemoveEventListenerNoArguments : UseCounter::RemoveEventListenerOneArgument);
+        return;
+    }
     EventTarget* impl = V8EventTarget::toImpl(info.Holder());
     if (LocalDOMWindow* window = impl->toDOMWindow()) {
         if (!BindingSecurity::shouldAllowAccessToFrame(info.GetIsolate(), window->frame(), exceptionState)) {
             exceptionState.throwIfNeeded();
             return;
         }
         if (!window->document())
             return;
     }
     V8StringResource<TreatNullAsNullString> type;
     RefPtr<EventListener> listener;
     bool capture;
     {
-        if (UNLIKELY(info.Length() <= 0)) {
-            impl->removeEventListener();
-            removeEventListenerMethodEpilogue(info, impl);
-            return;
-        }
         type = info[0];
         if (!type.prepare())
             return;
         listener = V8EventListenerList::getEventListener(ScriptState::current(info.GetIsolate()), info[1], false, ListenerFindOnly);
-        if (UNLIKELY(info.Length() <= 2)) {
-            impl->removeEventListener(type, listener);
-            removeEventListenerMethodEpilogue(info, impl);
-            return;
-        }
         capture = toBoolean(info.GetIsolate(), info[2], exceptionState);
         if (exceptionState.throwIfNeeded())
             return;
     }
     impl->removeEventListener(type, listener, capture);
     removeEventListenerMethodEpilogue(info, impl);
 }
 
 } // namespace blink