Distinguish actions registered with setTimeout() and setInterval().

Source/core/workers/WorkerGlobalScope.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009, 2011 Google 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
@@ skipping 163 matching lines @@
     return m_navigator.get();
 }
 
 void WorkerGlobalScope::postTask(PassOwnPtr<Task> task)
 {
     thread()->runLoop().postTask(task);
 }
 
 int WorkerGlobalScope::setTimeout(PassOwnPtr<ScheduledAction> action, int timeout)
 {
-    return DOMTimer::install(scriptExecutionContext(), action, timeout, true);
+    return DOMTimer::install(scriptExecutionContext(), DOMTimer::TimerTypeTimeout, action, timeout);
 }
 
 void WorkerGlobalScope::clearTimeout(int timeoutID)
 {
-    DOMTimer::removeByID(scriptExecutionContext(), timeoutID);
+    DOMTimer::removeByIDIfTypeMatches(scriptExecutionContext(), DOMTimer::TimerTypeTimeout, timeoutID);
 }
 
 void WorkerGlobalScope::clearInspector()
 {
     m_workerInspectorController.clear();
 }
 
 int WorkerGlobalScope::setInterval(PassOwnPtr<ScheduledAction> action, int timeout)
 {
-    return DOMTimer::install(scriptExecutionContext(), action, timeout, false);
+    return DOMTimer::install(scriptExecutionContext(), DOMTimer::TimerTypeInterval, action, timeout);
 }
 
 void WorkerGlobalScope::clearInterval(int timeoutID)
 {
-    DOMTimer::removeByID(scriptExecutionContext(), timeoutID);
+    DOMTimer::removeByIDIfTypeMatches(scriptExecutionContext(), DOMTimer::TimerTypeInterval, timeoutID);
 }
 
 void WorkerGlobalScope::importScripts(const Vector<String>& urls, ExceptionCode& ec)
 {
     ASSERT(contentSecurityPolicy());
     ec = 0;
     Vector<String>::const_iterator urlsEnd = urls.end();
     Vector<KURL> completedURLs;
     for (Vector<String>::const_iterator it = urls.begin(); it != urlsEnd; ++it) {
         const KURL& url = scriptExecutionContext()->completeURL(*it);
@@ skipping 133 matching lines @@
         iter = m_workerObservers.begin();
     }
 }
 
 WorkerEventQueue* WorkerGlobalScope::eventQueue() const
 {
     return m_eventQueue.get();
 }
 
 } // namespace WebCore