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

Unified Diff: third_party/WebKit/WebCore/dom/WorkerMessagingProxy.h

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 11 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
Index: third_party/WebKit/WebCore/dom/WorkerMessagingProxy.h
===================================================================
--- third_party/WebKit/WebCore/dom/WorkerMessagingProxy.h (revision 9118)
+++ third_party/WebKit/WebCore/dom/WorkerMessagingProxy.h (working copy)
@@ -40,7 +40,6 @@
class ScriptExecutionContext;
class String;
class Worker;
- class WorkerTask;
class WorkerThread;
class WorkerMessagingProxy : Noncopyable {
@@ -49,25 +48,27 @@
void postMessageToWorkerObject(const String& message);
void postMessageToWorkerContext(const String& message);
- void postTaskToParentContext(PassRefPtr<ScriptExecutionContext::Task>);
+ void postTaskToWorkerObject(PassRefPtr<ScriptExecutionContext::Task>);
+ void postTaskToWorkerContext(PassRefPtr<ScriptExecutionContext::Task>);
+
void postWorkerException(const String& errorMessage, int lineNumber, const String& sourceURL);
void workerThreadCreated(PassRefPtr<WorkerThread>);
void workerObjectDestroyed();
void workerContextDestroyed();
- void terminate();
-
void confirmWorkerThreadMessage(bool hasPendingActivity);
void reportWorkerThreadActivity(bool hasPendingActivity);
bool workerThreadHasPendingActivity() const;
+ // Only use these methods on the worker object thread.
+ void terminate();
+ bool askedToTerminate() const { return m_askedToTerminate; }
+
private:
- friend class GenericWorkerTaskBase;
friend class MessageWorkerTask;
friend class WorkerContextDestroyedTask;
- friend class WorkerExceptionTask;
friend class WorkerThreadActivityReportTask;
~WorkerMessagingProxy();
@@ -75,7 +76,6 @@
void workerContextDestroyedInternal();
void reportWorkerThreadActivityInternal(bool confirmingMessage, bool hasPendingActivity);
Worker* workerObject() const { return m_workerObject; }
- bool askedToTerminate() { return m_askedToTerminate; }
RefPtr<ScriptExecutionContext> m_scriptExecutionContext;
Worker* m_workerObject;
@@ -86,7 +86,7 @@
bool m_askedToTerminate;
- Vector<RefPtr<WorkerTask> > m_queuedEarlyTasks; // Tasks are queued here until there's a thread object created.
+ Vector<RefPtr<ScriptExecutionContext::Task> > m_queuedEarlyTasks; // Tasks are queued here until there's a thread object created.
};
} // namespace WebCore
« no previous file with comments | « third_party/WebKit/WebCore/dom/WorkerContext.idl ('k') | third_party/WebKit/WebCore/dom/WorkerMessagingProxy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698