| Index: Source/bindings/v8/ScheduledAction.cpp
|
| diff --git a/Source/bindings/v8/ScheduledAction.cpp b/Source/bindings/v8/ScheduledAction.cpp
|
| index a0089cc1a4bbef9c38f428ea668eaf3c2ae9b2fc..1de2039ec15323eac46f90e37068a354ac045b12 100644
|
| --- a/Source/bindings/v8/ScheduledAction.cpp
|
| +++ b/Source/bindings/v8/ScheduledAction.cpp
|
| @@ -51,9 +51,9 @@ ScheduledAction::ScheduledAction(v8::Handle<v8::Context> context, v8::Handle<v8:
|
| , m_code(String(), KURL(), TextPosition::belowRangePosition())
|
| , m_isolate(isolate)
|
| {
|
| - m_args.reserveCapacity(argc);
|
| + m_info.reserveCapacity(argc);
|
| for (int i = 0; i < argc; ++i)
|
| - m_args.append(UnsafePersistent<v8::Value>(m_isolate, argv[i]));
|
| + m_info.append(UnsafePersistent<v8::Value>(m_isolate, argv[i]));
|
| }
|
|
|
| ScheduledAction::ScheduledAction(v8::Handle<v8::Context> context, const String& code, const KURL& url, v8::Isolate* isolate)
|
| @@ -65,8 +65,8 @@ ScheduledAction::ScheduledAction(v8::Handle<v8::Context> context, const String&
|
|
|
| ScheduledAction::~ScheduledAction()
|
| {
|
| - for (size_t i = 0; i < m_args.size(); ++i)
|
| - m_args[i].dispose();
|
| + for (size_t i = 0; i < m_info.size(); ++i)
|
| + m_info[i].dispose();
|
| }
|
|
|
| void ScheduledAction::execute(ExecutionContext* context)
|
| @@ -95,9 +95,9 @@ void ScheduledAction::execute(Frame* frame)
|
|
|
| if (!m_function.isEmpty()) {
|
| v8::Context::Scope scope(context);
|
| - Vector<v8::Handle<v8::Value> > args;
|
| - createLocalHandlesForArgs(&args);
|
| - frame->script().callFunction(m_function.newLocal(m_isolate), context->Global(), args.size(), args.data());
|
| + Vector<v8::Handle<v8::Value> > info;
|
| + createLocalHandlesForArgs(&info);
|
| + frame->script().callFunction(m_function.newLocal(m_isolate), context->Global(), info.size(), info.data());
|
| } else {
|
| frame->script().executeScriptAndReturnValue(context, ScriptSourceCode(m_code));
|
| }
|
| @@ -113,18 +113,18 @@ void ScheduledAction::execute(WorkerGlobalScope* worker)
|
| ASSERT(!context.IsEmpty());
|
| v8::Context::Scope scope(context);
|
| if (!m_function.isEmpty()) {
|
| - Vector<v8::Handle<v8::Value> > args;
|
| - createLocalHandlesForArgs(&args);
|
| - V8ScriptRunner::callFunction(m_function.newLocal(m_isolate), worker, context->Global(), args.size(), args.data(), m_isolate);
|
| + Vector<v8::Handle<v8::Value> > info;
|
| + createLocalHandlesForArgs(&info);
|
| + V8ScriptRunner::callFunction(m_function.newLocal(m_isolate), worker, context->Global(), info.size(), info.data(), m_isolate);
|
| } else
|
| worker->script()->evaluate(m_code);
|
| }
|
|
|
| void ScheduledAction::createLocalHandlesForArgs(Vector<v8::Handle<v8::Value> >* handles)
|
| {
|
| - handles->reserveCapacity(m_args.size());
|
| - for (size_t i = 0; i < m_args.size(); ++i)
|
| - handles->append(m_args[i].newLocal(m_isolate));
|
| + handles->reserveCapacity(m_info.size());
|
| + for (size_t i = 0; i < m_info.size(); ++i)
|
| + handles->append(m_info[i].newLocal(m_isolate));
|
| }
|
|
|
| } // namespace WebCore
|
|
|