| Index: Source/core/dom/MainThreadTaskRunnerTest.cpp
|
| diff --git a/Source/core/dom/MainThreadTaskRunnerTest.cpp b/Source/core/dom/MainThreadTaskRunnerTest.cpp
|
| index af3355d8adcde752790b0a749a8b7a637d3448bf..35abf8d55e16d3f5fa9d0945846353a305f60c72 100644
|
| --- a/Source/core/dom/MainThreadTaskRunnerTest.cpp
|
| +++ b/Source/core/dom/MainThreadTaskRunnerTest.cpp
|
| @@ -30,8 +30,10 @@
|
|
|
| #include "core/dom/ExecutionContext.h"
|
| #include "core/dom/ExecutionContextTask.h"
|
| +#include "core/dom/SecurityContext.h"
|
| #include "core/events/EventQueue.h"
|
| #include "core/testing/UnitTestHelpers.h"
|
| +#include "wtf/Forward.h"
|
| #include <gtest/gtest.h>
|
|
|
| using namespace WebCore;
|
| @@ -47,7 +49,7 @@ public:
|
| virtual void close() OVERRIDE { }
|
| };
|
|
|
| -class NullExecutionContext : public RefCountedWillBeGarbageCollectedFinalized<NullExecutionContext>, public ExecutionContext {
|
| +class NullExecutionContext : public RefCountedWillBeGarbageCollectedFinalized<NullExecutionContext>, public SecurityContext, public ExecutionContext {
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NullExecutionContext);
|
| public:
|
| void trace(Visitor* visitor) { ExecutionContext::trace(visitor); }
|
| @@ -55,6 +57,10 @@ public:
|
| using RefCounted<NullExecutionContext>::ref;
|
| using RefCounted<NullExecutionContext>::deref;
|
|
|
| + virtual void reportBlockedScriptExecutionToInspector(const String& directiveText) OVERRIDE { }
|
| +
|
| + virtual SecurityContext& securityContext() { return *this; }
|
| +
|
| virtual void refExecutionContext() OVERRIDE { ref(); }
|
| virtual void derefExecutionContext() OVERRIDE { deref(); }
|
| #endif
|
| @@ -65,9 +71,15 @@ public:
|
|
|
| NullExecutionContext();
|
|
|
| +protected:
|
| + virtual const KURL& virtualURL() const OVERRIDE { return m_dummyURL; }
|
| + virtual KURL virtualCompleteURL(const String&) const OVERRIDE { return m_dummyURL; }
|
| +
|
| private:
|
| bool m_tasksNeedSuspension;
|
| OwnPtr<EventQueue> m_queue;
|
| +
|
| + KURL m_dummyURL;
|
| };
|
|
|
| NullExecutionContext::NullExecutionContext()
|
|
|