| Index: Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
|
| diff --git a/Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp b/Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
|
| index 3a3e7a5550808ea1f5b2760f4545061065b4137b..b286c7647ae48201891b7e6d8ba6fe3e29060d91 100644
|
| --- a/Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
|
| +++ b/Source/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
|
| @@ -44,7 +44,6 @@
|
| #include "MediaPlayer.h"
|
| #include "Page.h"
|
| #include "PlatformScreen.h"
|
| -#include "ScheduledAction.h"
|
| #include "ScriptSourceCode.h"
|
| #include "SerializedScriptValue.h"
|
| #include "Settings.h"
|
| @@ -63,6 +62,7 @@
|
| #include "V8MessagePortCustom.h"
|
| #include "V8Node.h"
|
| #include "V8Proxy.h"
|
| +#include "V8ScheduledAction.h"
|
| #include "V8Utilities.h"
|
| #if ENABLE(WEB_SOCKETS)
|
| #include "WebSocket.h"
|
| @@ -126,7 +126,7 @@ v8::Handle<v8::Value> WindowSetTimeoutImpl(const v8::Arguments& args, bool singl
|
| }
|
|
|
| // params is passed to action, and released in action's destructor
|
| - OwnPtr<ScheduledAction> action = adoptPtr(new ScheduledAction(V8Proxy::context(imp->frame()), v8::Handle<v8::Function>::Cast(function), paramCount, params));
|
| + OwnPtr<ScheduledAction> action = adoptPtr(new V8ScheduledAction(V8Proxy::context(imp->frame()), v8::Handle<v8::Function>::Cast(function), paramCount, params));
|
|
|
| // FIXME: We should use OwnArrayPtr for params.
|
| delete[] params;
|
| @@ -135,7 +135,7 @@ v8::Handle<v8::Value> WindowSetTimeoutImpl(const v8::Arguments& args, bool singl
|
| } else {
|
| if (imp->document() && !imp->document()->contentSecurityPolicy()->allowEval())
|
| return v8::Integer::New(0);
|
| - id = DOMTimer::install(scriptContext, adoptPtr(new ScheduledAction(V8Proxy::context(imp->frame()), functionString)), timeout, singleShot);
|
| + id = DOMTimer::install(scriptContext, adoptPtr(new V8ScheduledAction(V8Proxy::context(imp->frame()), functionString)), timeout, singleShot);
|
| }
|
|
|
| // Try to do the idle notification before the timeout expires to get better
|
|
|