WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/dom/WorkerMessagingProxy.h

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 22 matching lines @@
 #include <wtf/Noncopyable.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
 
     class ScriptExecutionContext;
     class String;
     class Worker;
-    class WorkerTask;
     class WorkerThread;
 
     class WorkerMessagingProxy : Noncopyable {
     public:
         WorkerMessagingProxy(PassRefPtr<ScriptExecutionContext>, Worker*);
 
         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();
 
         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;
         RefPtr<WorkerThread> m_workerThread;
 
         unsigned m_unconfirmedMessageCount; // Unconfirmed messages from worker object to worker thread.
         bool m_workerThreadHadPendingActivity; // The latest confirmation from worker thread reported that it was still active.
 
         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
 
 #endif // ENABLE(WORKERS)
 
 #endif // WorkerMessagingProxy_h