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 28 matching lines @@
 #include "bindings/v8/WorkerScriptController.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/inspector/ScriptCallStack.h"
 #include "core/page/ContentSecurityPolicy.h"
 #include "core/page/DOMTimer.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "modules/websockets/WebSocket.h"
 
 namespace WebCore {
 
-void SetTimeoutOrInterval(const v8::FunctionCallbackInfo<v8::Value>& args, bool singleShot)
+void SetTimeoutOrInterval(const v8::FunctionCallbackInfo<v8::Value>& args, DOMTimer::TimerType timerType)
 {
     WorkerGlobalScope* workerGlobalScope = V8WorkerGlobalScope::toNative(args.Holder());
 
     int argumentCount = args.Length();
     if (argumentCount < 1)
         return;
 
     v8::Handle<v8::Value> function = args[0];
     int32_t timeout = argumentCount >= 2 ? args[1]->Int32Value() : 0;
     int timerId;
 
     WorkerScriptController* script = workerGlobalScope->script();
     if (!script)
         return;
 
     v8::Handle<v8::Context> v8Context = script->context();
     if (function->IsString()) {
         if (ContentSecurityPolicy* policy = workerGlobalScope->contentSecurityPolicy()) {
             if (!policy->allowEval()) {
                 v8SetReturnValue(args, 0);
                 return;
             }
         }
         WTF::String stringFunction = toWebCoreString(function);
-        timerId = DOMTimer::install(workerGlobalScope, adoptPtr(new ScheduledAction(v8Context, stringFunction, workerGlobalScope->url(), args.GetIsolate())), timeout, singleShot);
+        timerId = DOMTimer::install(workerGlobalScope, timerType, adoptPtr(new ScheduledAction(v8Context, stringFunction, workerGlobalScope->url(), args.GetIsolate())), timeout);
     } else if (function->IsFunction()) {
         size_t paramCount = argumentCount >= 2 ? argumentCount - 2 : 0;
         v8::Local<v8::Value>* params = 0;
         if (paramCount > 0) {
             params = new v8::Local<v8::Value>[paramCount];
             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.
         OwnPtr<ScheduledAction> action = adoptPtr(new ScheduledAction(v8Context, v8::Handle<v8::Function>::Cast(function), paramCount, params, args.GetIsolate()));
         // FIXME: We should use a OwnArrayPtr for params.
         delete [] params;
-        timerId = DOMTimer::install(workerGlobalScope, action.release(), timeout, singleShot);
+        timerId = DOMTimer::install(workerGlobalScope, timerType, action.release(), timeout);
     } else
         return;
 
     v8SetReturnValue(args, timerId);
 }
 
 void V8WorkerGlobalScope::importScriptsMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     if (!args.Length())
         return;
@@ skipping 11 matching lines @@
     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::TimerTypeTimeout);
 }
 
 void V8WorkerGlobalScope::setIntervalMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
-    return SetTimeoutOrInterval(args, false);
+    return SetTimeoutOrInterval(args, DOMTimer::TimerTypeInterval);
 }
 
 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