Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(733)

Unified Diff: Source/core/dom/MainThreadTaskRunnerTest.cpp

Issue 338833002: Factor out NullExecutionContext from unittest files. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed #2 Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/testing/NullExecutionContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/MainThreadTaskRunnerTest.cpp
diff --git a/Source/core/dom/MainThreadTaskRunnerTest.cpp b/Source/core/dom/MainThreadTaskRunnerTest.cpp
index ed48c94cd41e9daafed213d13bc2859735dfb975..56e05f9940d524232f80ee5cfb61f51a9e3d8e48 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)
@@ -132,13 +80,13 @@ TEST(MainThreadTaskRunnerTest, SuspendTask)
OwnPtr<MainThreadTaskRunner> runner = MainThreadTaskRunner::create(context.get());
bool isMarked = false;
- context->setTasksNeedSuspention(true);
+ context->setTasksNeedSuspension(true);
runner->postTask(MarkingBooleanTask::create(&isMarked));
runner->suspend();
WebCore::testing::runPendingTasks();
EXPECT_FALSE(isMarked);
- context->setTasksNeedSuspention(false);
+ context->setTasksNeedSuspension(false);
runner->resume();
WebCore::testing::runPendingTasks();
EXPECT_TRUE(isMarked);
@@ -150,7 +98,7 @@ TEST(MainThreadTaskRunnerTest, RemoveRunner)
OwnPtr<MainThreadTaskRunner> runner = MainThreadTaskRunner::create(context.get());
bool isMarked = false;
- context->setTasksNeedSuspention(true);
+ context->setTasksNeedSuspension(true);
runner->postTask(MarkingBooleanTask::create(&isMarked));
runner.clear();
WebCore::testing::runPendingTasks();
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/testing/NullExecutionContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698