WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/dom/WorkerContext.h

Index: third_party/WebKit/WebCore/dom/WorkerContext.h
===================================================================
--- third_party/WebKit/WebCore/dom/WorkerContext.h	(revision 9118)
+++ third_party/WebKit/WebCore/dom/WorkerContext.h	(working copy)
@@ -41,6 +41,7 @@
 
 namespace WebCore {
 
+    class ScheduledAction;
     class WorkerLocation;
     class WorkerNavigator;
     class WorkerThread;
@@ -78,8 +79,11 @@
 
         void postMessage(const String& message);
         virtual void postTask(PassRefPtr<Task>); // Executes the task on context's thread asynchronously.
-        void postTaskToParentContext(PassRefPtr<Task>); // Executes the task in the parent's context (and thread) asynchronously.
+        void postTaskToWorkerObject(PassRefPtr<Task>); // Executes the task on the worker object's thread asynchronously.
 
+        int installTimeout(ScheduledAction*, int timeout, bool singleShot);
+        void removeTimeout(int timeoutId);
+
         virtual void addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture);
         virtual void removeEventListener(const AtomicString& eventType, EventListener*, bool useCapture);
         virtual bool dispatchEvent(PassRefPtr<Event>, ExceptionCode&);