WebKit merge 40500:40539 [WebKit side]

third_party/WebKit/WebCore/dom/WorkerContext.cpp

 /*
  * 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 13 matching lines @@
  *
  */
 
 #include "config.h"
 
 #if ENABLE(WORKERS)
 
 #include "WorkerContext.h"
 
 #include "ActiveDOMObject.h"
+#include "DOMTimer.h"
 #include "DOMWindow.h"
 #include "Event.h"
 #include "EventException.h"
 #include "GenericWorkerTask.h"
 #include "NotImplemented.h"
 #include "SecurityOrigin.h"
 #include "WorkerLocation.h"
 #include "WorkerMessagingProxy.h"
 #include "WorkerNavigator.h"
-#include "WorkerTask.h"
 #include "WorkerThread.h"
 #include <wtf/RefPtr.h>
 
 namespace WebCore {
 
 WorkerContext::WorkerContext(const KURL& url, const String& userAgent, WorkerThread* thread)
     : m_url(url)
     , m_userAgent(userAgent)
     , m_location(WorkerLocation::create(url))
     , m_script(new WorkerScriptController(this))
@@ skipping 50 matching lines @@
             return true;
     }
     return false;
 }
 
 void WorkerContext::reportException(const String& errorMessage, int lineNumber, const String& sourceURL)
 {
     m_thread->messagingProxy()->postWorkerException(errorMessage, lineNumber, sourceURL);
 }
 
-static void addMessageTask(ScriptExecutionContext* context, MessageDestination destination, MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceURL)
+static void addMessageTask(ScriptExecutionContext* context, WorkerMessagingProxy* messagingProxy, MessageDestination destination, MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceURL)
 {
+    if (messagingProxy->askedToTerminate())
+        return;
     context->addMessage(destination, source, level, message, lineNumber, sourceURL);
 }
 
 void WorkerContext::addMessage(MessageDestination destination, MessageSource source, MessageLevel level, const String& message, unsigned lineNumber, const String& sourceURL)
 {
-    // createCallbackTask has to be a separate statement from postTaskToParentContext to make the destructor
-    // for message.copy() get called before postTaskToParentContext.  (If they are one statement, the destructor
-    // gets called after postTaskToParentContext which causes a race condition.) 
-    RefPtr<Task> task = createCallbackTask(m_thread->messagingProxy(), &addMessageTask, destination, source, level, message.copy(), lineNumber, sourceURL.copy());
-    postTaskToParentContext(task.release());
+    postTaskToWorkerObject(createCallbackTask(&addMessageTask, m_thread->messagingProxy(), destination, source, level, message, lineNumber, sourceURL));
 }
 
 void WorkerContext::resourceRetrievedByXMLHttpRequest(unsigned long, const ScriptString&)
 {
     // FIXME: The implementation is pending the fixes in https://bugs.webkit.org/show_bug.cgi?id=23175
     notImplemented();
 }
 
 void WorkerContext::postMessage(const String& message)
 {
@@ skipping 44 matching lines @@
     ListenerVector listenersCopy = m_eventListeners.get(event->type());
     for (ListenerVector::const_iterator listenerIter = listenersCopy.begin(); listenerIter != listenersCopy.end(); ++listenerIter) {
         event->setTarget(this);
         event->setCurrentTarget(this);
         listenerIter->get()->handleEvent(event.get(), false);
     }
     
     return !event->defaultPrevented();
 }
 
-class ScriptExecutionContextTaskWorkerTask : public WorkerTask {
-public:
-    static PassRefPtr<ScriptExecutionContextTaskWorkerTask> create(PassRefPtr<ScriptExecutionContext::Task> task)
-    {
-        return adoptRef(new ScriptExecutionContextTaskWorkerTask(task));
-    }
-
-private:
-    ScriptExecutionContextTaskWorkerTask(PassRefPtr<ScriptExecutionContext::Task> task)
-        : m_task(task)
-    {
-    }
-
-    virtual void performTask(WorkerContext* context)
-    {
-        m_task->performTask(context);
-    }
-
-    RefPtr<ScriptExecutionContext::Task> m_task;
-};
-
 void WorkerContext::postTask(PassRefPtr<Task> task)
 {
-    thread()->runLoop().postTask(ScriptExecutionContextTaskWorkerTask::create(task));
+    thread()->runLoop().postTask(task);
 }
 
-void WorkerContext::postTaskToParentContext(PassRefPtr<Task> task)
+void WorkerContext::postTaskToWorkerObject(PassRefPtr<Task> task)
 {
-    thread()->messagingProxy()->postTaskToParentContext(task);
+    thread()->messagingProxy()->postTaskToWorkerObject(task);
+}
+
+int WorkerContext::installTimeout(ScheduledAction* action, int timeout, bool singleShot)
+{
+    return DOMTimer::install(scriptExecutionContext(), action, timeout, singleShot);
+}
+
+void WorkerContext::removeTimeout(int timeoutId)
+{
+    DOMTimer::removeById(scriptExecutionContext(), timeoutId);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(WORKERS)