Clean up macros around DEFINE_EVENT_TARGET_REFCOUNTING

Source/core/events/EventTarget.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  *           (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ skipping 67 matching lines @@
 //   EventTarget directly); or, if you want YourClass to be inherited from
 //   RefCountedGarbageCollected<YourClass> in addition to EventTargetWithInlineData,
 //   inherit from RefCountedGarbageCollectedEventTargetWithInlineData<YourClass>.
 // - In your class declaration, EventTargetWithInlineData (or
 //   RefCountedGarbageCollectedEventTargetWithInlineData<>) must come first in
 //   the base class list. If your class is non-final, classes inheriting from
 //   your class need to come first, too.
 // - Figure out if you now need to inherit from ActiveDOMObject as well.
 // - In your class declaration, you will typically use
 //   REFCOUNTED_EVENT_TARGET(YourClass) if YourClass is a RefCounted<>,
-//   or DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(OtherRefCounted<YourClass>)
+//   or REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(OtherRefCounted<YourClass>)
 //   if YourClass uses a different kind of reference counting template such as
 //   RefCountedGarbageCollected<YourClass>.
 // - Make sure to include this header file in your .h file, or you will get
 //   very strange compiler errors.
 // - If you added an onfoo attribute, use DEFINE_ATTRIBUTE_EVENT_LISTENER(foo)
 //   in your class declaration.
 // - Override EventTarget::interfaceName() and executionContext(). The former
 //   will typically return EventTargetNames::YourClassName. The latter will
 //   return ActiveDOMObject::executionContext (if you are an ActiveDOMObject)
 //   or the document you're in.
@@ skipping 174 matching lines @@
 inline bool EventTarget::hasCapturingEventListeners(const AtomicString& eventType)
 {
     EventTargetData* d = eventTargetData();
     if (!d)
         return false;
     return d->eventListenerMap.containsCapturing(eventType);
 }
 
 } // namespace blink
 
+// If the EventTarget class is RefCounted on non-oilpan builds,
+// use REFCOUNTED_EVENT_TARGET.
+// If the EventTarget class is RefCountedGarbageCollected on non-oilpan builds,
+// use REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET.
 #if ENABLE(OILPAN)
-
 #define DEFINE_EVENT_TARGET_REFCOUNTING(baseClass)
-#define DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(baseClass)
-
+#define REFCOUNTED_EVENT_TARGET(baseClass)
+#define REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(baseClass)
 #else // !ENABLE(OILPAN)
-
 #define DEFINE_EVENT_TARGET_REFCOUNTING(baseClass) \
 public: \
     using baseClass::ref; \
     using baseClass::deref; \
 private: \
     virtual void refEventTarget() override final { ref(); } \
     virtual void derefEventTarget() override final { deref(); } \
     typedef int thisIsHereToForceASemiColonAfterThisEventTargetMacro
-#define DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(baseClass) DEFINE_EVENT_TARGET_REFCOUNTING(baseClass)
-
+#define REFCOUNTED_EVENT_TARGET(baseClass) DEFINE_EVENT_TARGET_REFCOUNTING(RefCounted<baseClass>)
+#define REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(baseClass) DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedGarbageCollected<baseClass>)
 #endif // ENABLE(OILPAN)
 
-// Use this macro if your EventTarget subclass is also a subclass of WTF::RefCounted.
-// A ref-counted class that uses a different method of refcounting should use DEFINE_EVENT_TARGET_REFCOUNTING directly.
-// Both of these macros are meant to be placed just before the "public:" section of the class declaration.
-#define REFCOUNTED_EVENT_TARGET(className) DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCounted<className>)
-
 #endif // EventTarget_h