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

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

Index: third_party/WebKit/Source/core/dom/NodeRareData.h
diff --git a/third_party/WebKit/Source/core/dom/NodeRareData.h b/third_party/WebKit/Source/core/dom/NodeRareData.h
index 241b9f121e9ebf8b822919996ab56d0d91197545..d08dd577a3c453ae389829849d941d65d1641cef 100644
--- a/third_party/WebKit/Source/core/dom/NodeRareData.h
+++ b/third_party/WebKit/Source/core/dom/NodeRareData.h
@@ -74,7 +74,7 @@ class NodeMutationObserverData final
     visitor->trace(m_transientRegistry);
   }
 
-  DECLARE_TRACE_WRAPPERS_WITHOUT_BASE() {
+  DEFINE_INLINE_TRACE_WRAPPERS() {
     for (auto registration : m_registry) {
       visitor->traceWrappers(registration);
     }
@@ -91,6 +91,8 @@ class NodeMutationObserverData final
       m_transientRegistry;
 };
 
+DEFINE_TRAIT_FOR_TRACE_WRAPPERS(NodeMutationObserverData);
+
 class NodeRareData : public GarbageCollectedFinalized<NodeRareData>,
                      public NodeRareDataBase {
   WTF_MAKE_NONCOPYABLE(NodeRareData);
@@ -157,7 +159,7 @@ class NodeRareData : public GarbageCollectedFinalized<NodeRareData>,
   DECLARE_TRACE_AFTER_DISPATCH();
   void finalizeGarbageCollectedObject();
 
-  DECLARE_TRACE_WRAPPERS_WITHOUT_BASE();
+  DECLARE_TRACE_WRAPPERS();
   DECLARE_TRACE_WRAPPERS_AFTER_DISPATCH();
 
  protected:
@@ -180,6 +182,8 @@ class NodeRareData : public GarbageCollectedFinalized<NodeRareData>,
   unsigned m_isElementRareData : 1;
 };
 
+DEFINE_TRAIT_FOR_TRACE_WRAPPERS(NodeRareData);
+
 }  // namespace blink
 
 #endif  // NodeRareData_h