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

Source/core/dom/ScriptExecutionContext.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2012 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 262 matching lines @@
 }
 
 int ScriptExecutionContext::circularSequentialID()
 {
     ++m_circularSequentialID;
     if (m_circularSequentialID <= 0)
         m_circularSequentialID = 1;
     return m_circularSequentialID;
 }
 
-int ScriptExecutionContext::installNewTimeout(PassOwnPtr<ScheduledAction> action, int timeout, bool singleShot)
+int ScriptExecutionContext::installNewTimeout(DOMTimer::TimerType timerType, PassOwnPtr<ScheduledAction> action, int timeout)
 {
     int timeoutID;
     while (true) {
         timeoutID = circularSequentialID();
         if (!m_timeouts.contains(timeoutID))
             break;
     }
-    TimeoutMap::AddResult result = m_timeouts.add(timeoutID, DOMTimer::create(this, action, timeout, singleShot, timeoutID));
+    TimeoutMap::AddResult result = m_timeouts.add(timeoutID, DOMTimer::create(this, timerType, action, timeout, timeoutID));
     ASSERT(result.isNewEntry);
     DOMTimer* timer = result.iterator->value.get();
 
     timer->suspendIfNeeded();
 
-    return timer->timeoutID();
+    return timeoutID;
 }
 
-void ScriptExecutionContext::removeTimeoutByID(int timeoutID)
+void ScriptExecutionContext::removeTimeoutByIDIfTypeMatches(DOMTimer::TimerType timerType, int timeoutID)
 {
     if (timeoutID <= 0)
         return;
-    m_timeouts.remove(timeoutID);
+    TimeoutMap::iterator iter = m_timeouts.find(timeoutID);
+    if (iter != m_timeouts.end() && iter->value->timerType() == timerType)
+        m_timeouts.remove(iter);
 }
 
 PublicURLManager& ScriptExecutionContext::publicURLManager()
 {
     if (!m_publicURLManager)
         m_publicURLManager = PublicURLManager::create(this);
     return *m_publicURLManager;
 }
 
 void ScriptExecutionContext::didChangeTimerAlignmentInterval()
@@ skipping 33 matching lines @@
 ScriptExecutionContext::Task::~Task()
 {
 }
 
 void ScriptExecutionContext::setDatabaseContext(DatabaseContext* databaseContext)
 {
     m_databaseContext = databaseContext;
 }
 
 } // namespace WebCore