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

Source/bindings/v8/custom/V8WorkerGlobalScopeCustom.cpp

 /*
  * Copyright (C) 2009 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 30 matching lines @@
 #include "core/inspector/ScriptCallStack.h"
 #include "core/page/ContentSecurityPolicy.h"
 #include "core/page/DOMTimer.h"
 #include "core/page/DOMWindowTimers.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "modules/websockets/WebSocket.h"
 #include "wtf/OwnArrayPtr.h"
 
 namespace WebCore {
 
-void SetTimeoutOrInterval(const v8::FunctionCallbackInfo<v8::Value>& args, bool singleShot)
+void SetTimeoutOrInterval(const v8::FunctionCallbackInfo<v8::Value>& args, DOMTimer::Type timerType)
 {
     WorkerGlobalScope* workerGlobalScope = V8WorkerGlobalScope::toNative(args.Holder());
 
     int argumentCount = args.Length();
     if (argumentCount < 1)
         return;
 
     v8::Handle<v8::Value> function = args[0];
 
     WorkerScriptController* script = workerGlobalScope->script();
@@ skipping 18 matching lines @@
             for (size_t i = 0; i < paramCount; ++i)
                 params[i] = args[i+2];
         }
         // ScheduledAction takes ownership of actual params and releases them in its destructor.
         action = adoptPtr(new ScheduledAction(v8Context, v8::Handle<v8::Function>::Cast(function), paramCount, params.get(), args.GetIsolate()));
     } else
         return;
 
     int32_t timeout = argumentCount >= 2 ? args[1]->Int32Value() : 0;
     int timerId;
-    if (singleShot)
+    switch (timerType) {
+    case DOMTimer::TimeoutType:
         timerId = DOMWindowTimers::setTimeout(workerGlobalScope, action.release(), timeout);
-    else
+        break;
+    case DOMTimer::IntervalType:
         timerId = DOMWindowTimers::setInterval(workerGlobalScope, action.release(), timeout);
+        break;
+    }
 
     v8SetReturnValue(args, timerId);
 }
 
 void V8WorkerGlobalScope::importScriptsMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     if (!args.Length())
         return;
 
     Vector<String> urls;
     for (int i = 0; i < args.Length(); i++) {
         V8TRYCATCH_VOID(v8::Handle<v8::String>, scriptUrl, args[i]->ToString());
         if (scriptUrl.IsEmpty())
             return;
         urls.append(toWebCoreString(scriptUrl));
     }
 
     WorkerGlobalScope* workerGlobalScope = V8WorkerGlobalScope::toNative(args.Holder());
 
     ExceptionCode ec = 0;
     workerGlobalScope->importScripts(urls, ec);
 
     if (!ec)
         return;
     setDOMException(ec, args.GetIsolate());
 }
 
 void V8WorkerGlobalScope::setTimeoutMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
-    return SetTimeoutOrInterval(args, true);
+    return SetTimeoutOrInterval(args, DOMTimer::TimeoutType);
 }
 
 void V8WorkerGlobalScope::setIntervalMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
-    return SetTimeoutOrInterval(args, false);
+    return SetTimeoutOrInterval(args, DOMTimer::IntervalType);
 }
 
 v8::Handle<v8::Value> toV8(WorkerGlobalScope* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     // Notice that we explicitly ignore creationContext because the WorkerGlobalScope is its own creationContext.
 
     if (!impl)
         return v8NullWithCheck(isolate);
 
     WorkerScriptController* script = impl->script();
     if (!script)
         return v8NullWithCheck(isolate);
 
     v8::Handle<v8::Object> global = script->context()->Global();
     ASSERT(!global.IsEmpty());
     return global;
 }
 
 v8::Handle<v8::Value> toV8ForMainWorld(WorkerGlobalScope* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     return toV8(impl, creationContext, isolate);
 }
 
 } // namespace WebCore