| Index: third_party/WebKit/Source/web/SuspendableScriptExecutor.cpp
|
| diff --git a/third_party/WebKit/Source/web/SuspendableScriptExecutor.cpp b/third_party/WebKit/Source/web/SuspendableScriptExecutor.cpp
|
| index 3e285770791ffd526f62721ba751bd3af11b29ec..dbbf9acc733e76630b44d6686a8523860eebdd23 100644
|
| --- a/third_party/WebKit/Source/web/SuspendableScriptExecutor.cpp
|
| +++ b/third_party/WebKit/Source/web/SuspendableScriptExecutor.cpp
|
| @@ -132,17 +132,14 @@ Vector<v8::Local<v8::Value>> V8FunctionExecutor::execute(LocalFrame* frame) {
|
|
|
| SuspendableScriptExecutor* SuspendableScriptExecutor::create(
|
| LocalFrame* frame,
|
| - int worldID,
|
| + RefPtr<DOMWrapperWorld> world,
|
| const HeapVector<ScriptSourceCode>& sources,
|
| bool userGesture,
|
| WebScriptExecutionCallback* callback) {
|
| - // TODO(devlin): Passing in a v8::Isolate* directly would be better than
|
| - // toIsolate() here.
|
| - ScriptState* scriptState = ScriptState::forWorld(
|
| - frame, *DOMWrapperWorld::fromWorldId(toIsolate(frame), worldID));
|
| + ScriptState* scriptState = ScriptState::forWorld(frame, *world);
|
| return new SuspendableScriptExecutor(
|
| frame, scriptState, callback,
|
| - new WebScriptExecutor(sources, worldID, userGesture));
|
| + new WebScriptExecutor(sources, world->worldId(), userGesture));
|
| }
|
|
|
| void SuspendableScriptExecutor::createAndRun(
|
|
|