WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/dom/WorkerContext.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 23 matching lines @@
 #include "EventTarget.h"
 #include "ScriptExecutionContext.h"
 #include "WorkerScriptController.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
 
+    class ScheduledAction;
     class WorkerLocation;
     class WorkerNavigator;
     class WorkerThread;
 
     class WorkerContext : public RefCounted<WorkerContext>, public ScriptExecutionContext, public EventTarget {
     public:
         static PassRefPtr<WorkerContext> create(const KURL& url, const String& userAgent, WorkerThread* thread)
         {
             return adoptRef(new WorkerContext(url, userAgent, thread));
         }
@@ skipping 17 matching lines @@
         bool hasPendingActivity() const;
 
         virtual void reportException(const String& errorMessage, int lineNumber, const String& sourceURL);
         virtual void addMessage(MessageDestination, MessageSource, MessageLevel, const String& message, unsigned lineNumber, const String& sourceURL);
         virtual void resourceRetrievedByXMLHttpRequest(unsigned long identifier, const ScriptString& sourceString);
 
         virtual WorkerContext* toWorkerContext() { return this; }
 
         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&);
 
         void setOnmessage(PassRefPtr<EventListener> eventListener) { m_onmessageListener = eventListener; }
         EventListener* onmessage() const { return m_onmessageListener.get(); }
 
         typedef Vector<RefPtr<EventListener> > ListenerVector;
         typedef HashMap<AtomicString, ListenerVector> EventListenersMap;
@@ skipping 26 matching lines @@
     };
 
 } // namespace WebCore
 
 #endif // ENABLE(WORKERS)
 
 #endif // WorkerContext_h