| Index: Source/core/dom/MainThreadTaskRunnerTest.cpp
|
| diff --git a/Source/core/dom/MainThreadTaskRunnerTest.cpp b/Source/core/dom/MainThreadTaskRunnerTest.cpp
|
| index ed48c94cd41e9daafed213d13bc2859735dfb975..2a2963a364367a4875fb9030e31c9b2473215081 100644
|
| --- a/Source/core/dom/MainThreadTaskRunnerTest.cpp
|
| +++ b/Source/core/dom/MainThreadTaskRunnerTest.cpp
|
| @@ -28,71 +28,19 @@
|
| #include "config.h"
|
| #include "core/dom/MainThreadTaskRunner.h"
|
|
|
| -#include "core/dom/ExecutionContext.h"
|
| #include "core/dom/ExecutionContextTask.h"
|
| -#include "core/dom/SecurityContext.h"
|
| -#include "core/events/EventQueue.h"
|
| +#include "core/testing/NullExecutionContext.h"
|
| #include "core/testing/UnitTestHelpers.h"
|
| +#include "platform/heap/Handle.h"
|
| #include "wtf/Forward.h"
|
| +#include "wtf/OwnPtr.h"
|
| +#include "wtf/PassOwnPtr.h"
|
| #include <gtest/gtest.h>
|
|
|
| using namespace WebCore;
|
|
|
| namespace {
|
|
|
| -class NullEventQueue : public EventQueue {
|
| -public:
|
| - NullEventQueue() { }
|
| - virtual ~NullEventQueue() { }
|
| - virtual bool enqueueEvent(PassRefPtrWillBeRawPtr<Event>) OVERRIDE { return true; }
|
| - virtual bool cancelEvent(Event*) OVERRIDE { return true; }
|
| - virtual void close() OVERRIDE { }
|
| -};
|
| -
|
| -class NullExecutionContext : public RefCountedWillBeGarbageCollectedFinalized<NullExecutionContext>, public SecurityContext, public ExecutionContext {
|
| - WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NullExecutionContext);
|
| -public:
|
| - NullExecutionContext();
|
| -
|
| - virtual EventQueue* eventQueue() const OVERRIDE { return m_queue.get(); }
|
| - virtual bool tasksNeedSuspension() { return m_tasksNeedSuspension; }
|
| -
|
| - void setTasksNeedSuspention(bool flag) { m_tasksNeedSuspension = flag; }
|
| -
|
| - void trace(Visitor* visitor)
|
| - {
|
| - visitor->trace(m_queue);
|
| - ExecutionContext::trace(visitor);
|
| - }
|
| -
|
| - virtual void reportBlockedScriptExecutionToInspector(const String& directiveText) OVERRIDE { }
|
| - virtual SecurityContext& securityContext() { return *this; }
|
| -
|
| -#if !ENABLE(OILPAN)
|
| - using RefCounted<NullExecutionContext>::ref;
|
| - using RefCounted<NullExecutionContext>::deref;
|
| -
|
| - virtual void refExecutionContext() OVERRIDE { ref(); }
|
| - virtual void derefExecutionContext() OVERRIDE { deref(); }
|
| -#endif
|
| -
|
| -protected:
|
| - virtual const KURL& virtualURL() const OVERRIDE { return m_dummyURL; }
|
| - virtual KURL virtualCompleteURL(const String&) const OVERRIDE { return m_dummyURL; }
|
| -
|
| -private:
|
| - bool m_tasksNeedSuspension;
|
| - OwnPtrWillBeMember<EventQueue> m_queue;
|
| -
|
| - KURL m_dummyURL;
|
| -};
|
| -
|
| -NullExecutionContext::NullExecutionContext()
|
| - : m_tasksNeedSuspension(false)
|
| - , m_queue(adoptPtrWillBeNoop(new NullEventQueue()))
|
| -{
|
| -}
|
| -
|
| class MarkingBooleanTask FINAL : public ExecutionContextTask {
|
| public:
|
| static PassOwnPtr<MarkingBooleanTask> create(bool* toBeMarked)
|
|
|