| Index: Source/core/workers/Worker.h
|
| diff --git a/Source/core/workers/Worker.h b/Source/core/workers/Worker.h
|
| index 647fc55407f7b5241b705f72e33ea955e986dc2f..6c77bfffd7321c3e2be2a8ed19c6fb27ef1967bc 100644
|
| --- a/Source/core/workers/Worker.h
|
| +++ b/Source/core/workers/Worker.h
|
| @@ -32,6 +32,7 @@
|
| #include "core/events/EventListener.h"
|
| #include "core/events/EventTarget.h"
|
| #include "core/workers/AbstractWorker.h"
|
| +#include "core/workers/WorkerMessagingProxy.h"
|
| #include "core/workers/WorkerScriptLoaderClient.h"
|
| #include "platform/heap/Handle.h"
|
| #include "wtf/Forward.h"
|
| @@ -53,7 +54,7 @@ public:
|
|
|
| virtual const AtomicString& interfaceName() const OVERRIDE;
|
|
|
| - void postMessage(ExecutionContext*, PassRefPtr<SerializedScriptValue> message, const MessagePortArray*, ExceptionState&);
|
| + void postMessage(ExecutionContext*, PassRefPtr<SerializedScriptValue > message, const MessagePortArray*, ExceptionState&);
|
|
|
| void terminate();
|
|
|
| @@ -61,8 +62,9 @@ public:
|
| virtual bool hasPendingActivity() const OVERRIDE;
|
|
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
|
| -
|
| virtual void trace(Visitor*) OVERRIDE;
|
| + void processRAF(double monotonicAnimationStartTime);
|
| + WorkerGlobalScopeProxy* m_contextProxy; // The proxy outlives the worker to perform thread shutdown.
|
|
|
| private:
|
| explicit Worker(ExecutionContext*);
|
| @@ -70,9 +72,8 @@ private:
|
| // WorkerScriptLoaderClient callbacks
|
| virtual void didReceiveResponse(unsigned long identifier, const ResourceResponse&) OVERRIDE;
|
| virtual void notifyFinished() OVERRIDE;
|
| -
|
| + ExecutionContext* context;
|
| RefPtr<WorkerScriptLoader> m_scriptLoader;
|
| - WorkerGlobalScopeProxy* m_contextProxy; // The proxy outlives the worker to perform thread shutdown.
|
| };
|
|
|
| } // namespace blink
|
|
|