| Index: third_party/WebKit/Source/platform/heap/WrapperVisitor.h
|
| diff --git a/third_party/WebKit/Source/platform/heap/WrapperVisitor.h b/third_party/WebKit/Source/platform/heap/WrapperVisitor.h
|
| index 3e0c49b8e52a2a06960fdef4b8a371cf50e6c3f0..2978d90566d9d90cd7d76a365646c4c668e8df79 100644
|
| --- a/third_party/WebKit/Source/platform/heap/WrapperVisitor.h
|
| +++ b/third_party/WebKit/Source/platform/heap/WrapperVisitor.h
|
| @@ -27,20 +27,6 @@ class TraceWrapperBase;
|
| template <typename T>
|
| class TraceWrapperMember;
|
|
|
| -// Only add a special class here if the class cannot derive from
|
| -// TraceWrapperBase.
|
| -#define WRAPPER_VISITOR_SPECIAL_CLASSES(V) \
|
| - V(ElementRareData) \
|
| - V(NodeListsNodeData) \
|
| - V(NodeMutationObserverData) \
|
| - V(NodeRareData)
|
| -
|
| -#define FORWARD_DECLARE_SPECIAL_CLASSES(className) class className;
|
| -
|
| -WRAPPER_VISITOR_SPECIAL_CLASSES(FORWARD_DECLARE_SPECIAL_CLASSES);
|
| -
|
| -#undef FORWARD_DECLARE_SPECIAL_CLASSES
|
| -
|
| /**
|
| * Declares non-virtual traceWrappers method. Should be used on
|
| * non-ScriptWrappable classes which should participate in wrapper tracing (e.g.
|
| @@ -150,22 +136,11 @@ class PLATFORM_EXPORT WrapperVisitor {
|
| virtual void markWrapper(const v8::PersistentBase<v8::Value>*) const = 0;
|
|
|
| virtual void dispatchTraceWrappers(const TraceWrapperBase*) const = 0;
|
| -#define DECLARE_DISPATCH_TRACE_WRAPPERS(ClassName) \
|
| - virtual void dispatchTraceWrappers(const ClassName*) const = 0;
|
| -
|
| - WRAPPER_VISITOR_SPECIAL_CLASSES(DECLARE_DISPATCH_TRACE_WRAPPERS);
|
| -
|
| -#undef DECLARE_DISPATCH_TRACE_WRAPPERS
|
|
|
| virtual bool markWrapperHeader(HeapObjectHeader*) const = 0;
|
|
|
| virtual void markWrappersInAllWorlds(const ScriptWrappable*) const = 0;
|
|
|
| - void markWrappersInAllWorlds(const void*) const {
|
| - // Empty handler used for WRAPPER_VISITOR_SPECIAL_CLASSES. These types
|
| - // don't require marking wrappers in all worlds, so just nop on those.
|
| - }
|
| -
|
| template <typename T>
|
| ALWAYS_INLINE void markAndPushToMarkingDeque(const T* traceable) const {
|
| if (pushToMarkingDeque(TraceTrait<T>::traceMarkedWrapper,
|
| @@ -184,17 +159,6 @@ class PLATFORM_EXPORT WrapperVisitor {
|
| const void*) const = 0;
|
| };
|
|
|
| -#define SPECIALIZE_WRAPPER_TRACING_MARK_TRAIT(ClassName) \
|
| - template <> \
|
| - class CanTraceWrappers<ClassName, false> { \
|
| - public: \
|
| - static const bool value = true; \
|
| - };
|
| -
|
| -WRAPPER_VISITOR_SPECIAL_CLASSES(SPECIALIZE_WRAPPER_TRACING_MARK_TRAIT)
|
| -
|
| -#undef SPECIALIZE_WRAPPER_TRACING_MARK_TRAIT
|
| -
|
| } // namespace blink
|
|
|
| #endif // WrapperVisitor_h
|
|
|