diff options
author | Steve Block <steveblock@google.com> | 2009-10-08 17:19:54 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:58 +0100 |
commit | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (patch) | |
tree | a6c7e2d6cd7bfa7011cc39abbb436142d7a4a7c8 /WebCore/workers/WorkerMessagingProxy.h | |
parent | e196732677050bd463301566a68a643b6d14b907 (diff) | |
download | external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.zip external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.gz external_webkit-231d4e3152a9c27a73b6ac7badbe6be673aa3ddf.tar.bz2 |
Merge webkit.org at R49305 : Automatic merge by git.
Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
Diffstat (limited to 'WebCore/workers/WorkerMessagingProxy.h')
-rw-r--r-- | WebCore/workers/WorkerMessagingProxy.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/workers/WorkerMessagingProxy.h b/WebCore/workers/WorkerMessagingProxy.h index 841fc9a..754102a 100644 --- a/WebCore/workers/WorkerMessagingProxy.h +++ b/WebCore/workers/WorkerMessagingProxy.h @@ -42,7 +42,6 @@ namespace WebCore { class DedicatedWorkerThread; - class MessagePortChannel; class ScriptExecutionContext; class String; class Worker; @@ -55,17 +54,18 @@ namespace WebCore { // (Only use these methods in the worker object thread.) virtual void startWorkerContext(const KURL& scriptURL, const String& userAgent, const String& sourceCode); virtual void terminateWorkerContext(); - virtual void postMessageToWorkerContext(const String&, PassOwnPtr<MessagePortChannel>); + virtual void postMessageToWorkerContext(PassRefPtr<SerializedScriptValue>, PassOwnPtr<MessagePortChannelArray>); virtual bool hasPendingActivity() const; virtual void workerObjectDestroyed(); // Implementations of WorkerObjectProxy. // (Only use these methods in the worker context thread.) - virtual void postMessageToWorkerObject(const String&, PassOwnPtr<MessagePortChannel>); + virtual void postMessageToWorkerObject(PassRefPtr<SerializedScriptValue>, PassOwnPtr<MessagePortChannelArray>); virtual void postExceptionToWorkerObject(const String& errorMessage, int lineNumber, const String& sourceURL); virtual void postConsoleMessageToWorkerObject(MessageDestination, MessageSource, MessageType, MessageLevel, const String& message, int lineNumber, const String& sourceURL); virtual void confirmMessageFromWorkerObject(bool hasPendingActivity); virtual void reportPendingActivity(bool hasPendingActivity); + virtual void workerContextClosed(); virtual void workerContextDestroyed(); // Implementation of WorkerLoaderProxy. |