Chromium Code Reviews| Index: Source/bindings/core/v8/ScriptPromiseProperty.h |
| diff --git a/Source/bindings/core/v8/ScriptPromiseProperty.h b/Source/bindings/core/v8/ScriptPromiseProperty.h |
| index c4bf4d201db33d238f29b0a82ccdd2bb9583280f..418049b0f5f3c2214ae94d44394c5fe06ee06138 100644 |
| --- a/Source/bindings/core/v8/ScriptPromiseProperty.h |
| +++ b/Source/bindings/core/v8/ScriptPromiseProperty.h |
| @@ -68,7 +68,7 @@ public: |
| // This method keeps the holder object and the property name. |
| void reset(); |
| - virtual void trace(Visitor*) override; |
| + DECLARE_VIRTUAL_TRACE(); |
| private: |
| virtual v8::Handle<v8::Object> holder(v8::Handle<v8::Object> creationContext, v8::Isolate*) override; |
| @@ -145,8 +145,19 @@ void ScriptPromiseProperty<HolderType, ResolvedType, RejectedType>::reset() |
| m_rejected = RejectedType(); |
| } |
| +#if ENABLE(INLINED_TRACE) |
| +template<typename HolderType, typename ResolvedType, typename RejectedType> |
| +void ScriptPromiseProperty<HolderType, ResolvedType, RejectedType>::trace(Visitor* visitor) { traceImpl(visitor); } |
| +template<typename HolderType, typename ResolvedType, typename RejectedType> |
| +void ScriptPromiseProperty<HolderType, ResolvedType, RejectedType>::trace(InlinedGlobalMarkingVisitor visitor) { traceImpl(visitor); } |
| + |
| +template<typename HolderType, typename ResolvedType, typename RejectedType> |
| +template <typename VisitorDispatcher> |
| +void ScriptPromiseProperty<HolderType, ResolvedType, RejectedType>::traceImpl(VisitorDispatcher visitor) |
| +#else |
| template<typename HolderType, typename ResolvedType, typename RejectedType> |
| void ScriptPromiseProperty<HolderType, ResolvedType, RejectedType>::trace(Visitor* visitor) |
| +#endif |
| { |
| TraceIfNeeded<HolderType>::trace(visitor, &m_holder); |
| TraceIfNeeded<ResolvedType>::trace(visitor, &m_resolved); |
| @@ -154,6 +165,7 @@ void ScriptPromiseProperty<HolderType, ResolvedType, RejectedType>::trace(Visito |
| ScriptPromisePropertyBase::trace(visitor); |
| } |
| + |
|
yhirano
2015/02/24 04:30:19
An unnecessary empty line
kouhei (in TOK)
2015/02/24 04:37:15
Done.
|
| } // namespace blink |
| #endif // ScriptPromiseProperty_h |