Change EventTarget callback APIs for add/RemoveEventListenerInternal.

third_party/WebKit/Source/modules/bluetooth/BluetoothRemoteGATTCharacteristic.cpp

 // Copyright 2015 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 "modules/bluetooth/BluetoothRemoteGATTCharacteristic.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMDataView.h"
@@ skipping 73 matching lines @@
 const WTF::AtomicString& BluetoothRemoteGATTCharacteristic::interfaceName() const
 {
     return EventTargetNames::BluetoothRemoteGATTCharacteristic;
 }
 
 ExecutionContext* BluetoothRemoteGATTCharacteristic::getExecutionContext() const
 {
     return ActiveDOMObject::getExecutionContext();
 }
 
-bool BluetoothRemoteGATTCharacteristic::addEventListenerInternal(const AtomicString& eventType, EventListener* listener, const EventListenerOptions& options)
+void BluetoothRemoteGATTCharacteristic::addedEventListener(const AtomicString& eventType, const RegisteredEventListener& registeredListener)
 {
+    EventTargetWithInlineData::addedEventListener(eventType, registeredListener);
     // We will also need to unregister a characteristic once all the event
     // listeners have been removed. See http://crbug.com/541390
     if (eventType == EventTypeNames::characteristicvaluechanged) {
         WebBluetooth* webbluetooth = BluetoothSupplement::fromExecutionContext(getExecutionContext());

[bokan, 2016/05/03 15:52:46]

This used to get called even if the listener failed to be added. Seems to me
like that might have been an oversight but would you mind adding someone who
worked on this to double check?

[dtapuska, 2016/05/03 20:53:04]

Added ortuno@

[ortuno, 2016/05/03 20:59:56]

I wasn't aware addEventListenerInternal was called even if the registration
failed. So thanks for the fix!

         webbluetooth->registerCharacteristicObject(m_webCharacteristic->characteristicInstanceID, this);
     }
-    return EventTarget::addEventListenerInternal(eventType, listener, options);
 }
 
 class ReadValueCallback : public WebBluetoothReadValueCallbacks {
 public:
     ReadValueCallback(BluetoothRemoteGATTCharacteristic* characteristic, ScriptPromiseResolver* resolver) : m_webCharacteristic(characteristic), m_resolver(resolver) {}
 
     void onSuccess(const WebVector<uint8_t>& value) override
     {
         if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
             return;
@@ skipping 98 matching lines @@
 
 DEFINE_TRACE(BluetoothRemoteGATTCharacteristic)
 {
     visitor->trace(m_properties);
     visitor->trace(m_value);
     EventTargetWithInlineData::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink