Index: Source/modules/indexeddb/IDBRequestTest.cpp |
diff --git a/Source/modules/indexeddb/IDBRequestTest.cpp b/Source/modules/indexeddb/IDBRequestTest.cpp |
index d346d6c054fb79716aa3585e6731ca232b81fec3..a05fa05eee8047609a04224d52fb44a3472d1281 100644 |
--- a/Source/modules/indexeddb/IDBRequestTest.cpp |
+++ b/Source/modules/indexeddb/IDBRequestTest.cpp |
@@ -56,7 +56,16 @@ public: |
class NullExecutionContext FINAL : public RefCountedWillBeGarbageCollectedFinalized<NullExecutionContext>, public ExecutionContext { |
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NullExecutionContext); |
public: |
- void trace(Visitor* visitor) { ExecutionContext::trace(visitor); } |
+ NullExecutionContext(); |
+ |
+ virtual EventQueue* eventQueue() const OVERRIDE { return m_queue.get(); } |
+ |
+ void trace(Visitor* visitor) |
+ { |
+ visitor->trace(m_queue); |
+ ExecutionContext::trace(visitor); |
+ } |
+ |
#if !ENABLE(OILPAN) |
using RefCounted<NullExecutionContext>::ref; |
using RefCounted<NullExecutionContext>::deref; |
@@ -64,15 +73,13 @@ public: |
virtual void refExecutionContext() OVERRIDE { ref(); } |
virtual void derefExecutionContext() OVERRIDE { deref(); } |
#endif |
- virtual EventQueue* eventQueue() const OVERRIDE { return m_queue.get(); } |
- NullExecutionContext(); |
private: |
- OwnPtr<EventQueue> m_queue; |
+ OwnPtrWillBeMember<EventQueue> m_queue; |
}; |
NullExecutionContext::NullExecutionContext() |
- : m_queue(adoptPtr(new NullEventQueue())) |
+ : m_queue(adoptPtrWillBeNoop(new NullEventQueue())) |
{ |
} |