OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007-2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2007-2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 void ScheduledAction::execute(WorkerGlobalScope* worker) | 128 void ScheduledAction::execute(WorkerGlobalScope* worker) |
129 { | 129 { |
130 ASSERT(worker->thread()->isCurrentThread()); | 130 ASSERT(worker->thread()->isCurrentThread()); |
131 ASSERT(m_scriptState->contextIsValid()); | 131 ASSERT(m_scriptState->contextIsValid()); |
132 if (!m_function.isEmpty()) { | 132 if (!m_function.isEmpty()) { |
133 ScriptState::Scope scope(m_scriptState.get()); | 133 ScriptState::Scope scope(m_scriptState.get()); |
134 Vector<v8::Local<v8::Value>> info; | 134 Vector<v8::Local<v8::Value>> info; |
135 createLocalHandlesForArgs(&info); | 135 createLocalHandlesForArgs(&info); |
136 V8ScriptRunner::callFunction(m_function.newLocal(m_scriptState->isolate(
)), worker, m_scriptState->context()->Global(), info.size(), info.data(), m_scri
ptState->isolate()); | 136 V8ScriptRunner::callFunction(m_function.newLocal(m_scriptState->isolate(
)), worker, m_scriptState->context()->Global(), info.size(), info.data(), m_scri
ptState->isolate()); |
137 } else { | 137 } else { |
138 worker->script()->evaluate(m_code); | 138 worker->scriptController()->evaluate(m_code); |
139 } | 139 } |
140 } | 140 } |
141 | 141 |
142 void ScheduledAction::createLocalHandlesForArgs(Vector<v8::Local<v8::Value>>* ha
ndles) | 142 void ScheduledAction::createLocalHandlesForArgs(Vector<v8::Local<v8::Value>>* ha
ndles) |
143 { | 143 { |
144 handles->reserveCapacity(m_info.Size()); | 144 handles->reserveCapacity(m_info.Size()); |
145 for (size_t i = 0; i < m_info.Size(); ++i) | 145 for (size_t i = 0; i < m_info.Size(); ++i) |
146 handles->append(m_info.Get(i)); | 146 handles->append(m_info.Get(i)); |
147 } | 147 } |
148 | 148 |
149 } // namespace blink | 149 } // namespace blink |
OLD | NEW |