[wrapper-tracing] Redesign dispatching on non-inheriting cases

third_party/WebKit/Source/core/dom/NodeRareData.h

 /*
  * Copyright (C) 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 David Smith <catfish.man@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 56 matching lines @@
   void removeRegistration(MutationObserverRegistration* registration) {
     DCHECK(m_registry.contains(registration));
     m_registry.remove(m_registry.find(registration));
   }
 
   DEFINE_INLINE_TRACE() {
     visitor->trace(m_registry);
     visitor->trace(m_transientRegistry);
   }
 
-  DECLARE_TRACE_WRAPPERS_WITHOUT_BASE() {
+  DEFINE_INLINE_TRACE_WRAPPERS() {
     for (auto registration : m_registry) {
       visitor->traceWrappers(registration);
     }
     for (auto registration : m_transientRegistry) {
       visitor->traceWrappers(registration);
     }
   }
 
  private:
   NodeMutationObserverData() {}
 
   HeapVector<TraceWrapperMember<MutationObserverRegistration>> m_registry;
   HeapHashSet<TraceWrapperMember<MutationObserverRegistration>>
       m_transientRegistry;
 };
 
+DEFINE_TRAIT_FOR_TRACE_WRAPPERS(NodeMutationObserverData);
+
 class NodeRareData : public GarbageCollectedFinalized<NodeRareData>,
                      public NodeRareDataBase {
   WTF_MAKE_NONCOPYABLE(NodeRareData);
 
  public:
   static NodeRareData* create(LayoutObject* layoutObject) {
     return new NodeRareData(layoutObject);
   }
 
   void clearNodeLists() { m_nodeLists.clear(); }
@@ skipping 46 matching lines @@
 
   enum {
     ConnectedFrameCountBits = 10,  // Must fit Page::maxNumberOfFrames.
   };
 
   DECLARE_TRACE();
 
   DECLARE_TRACE_AFTER_DISPATCH();
   void finalizeGarbageCollectedObject();
 
-  DECLARE_TRACE_WRAPPERS_WITHOUT_BASE();
+  DECLARE_TRACE_WRAPPERS();
   DECLARE_TRACE_WRAPPERS_AFTER_DISPATCH();
 
  protected:
   explicit NodeRareData(LayoutObject* layoutObject)
       : NodeRareDataBase(layoutObject),
         m_connectedFrameCount(0),
         m_elementFlags(0),
         m_restyleFlags(0),
         m_isElementRareData(false) {}
 
  private:
   Member<NodeListsNodeData> m_nodeLists;
   Member<NodeMutationObserverData> m_mutationObserverData;
 
   unsigned m_connectedFrameCount : ConnectedFrameCountBits;
   unsigned m_elementFlags : NumberOfElementFlags;
   unsigned m_restyleFlags : NumberOfDynamicRestyleFlags;
 
  protected:
   unsigned m_isElementRareData : 1;
 };
 
+DEFINE_TRAIT_FOR_TRACE_WRAPPERS(NodeRareData);
+
 }  // namespace blink
 
 #endif  // NodeRareData_h