| Index: Source/web/WebLocalFrameImpl.cpp
|
| diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp
|
| index 296e6ca3ac7ea8d1dab406172551d81a04c1f158..af4e42e4e94dab86004b193e4880ef4584b5d370 100644
|
| --- a/Source/web/WebLocalFrameImpl.cpp
|
| +++ b/Source/web/WebLocalFrameImpl.cpp
|
| @@ -896,12 +896,14 @@ void WebLocalFrameImpl::requestExecuteScriptInIsolatedWorld(int worldID, const W
|
| SuspendableScriptExecutor::createAndRun(frame(), worldID, createSourcesVector(sourcesIn, numSources), extensionGroup, userGesture, callback);
|
| }
|
|
|
| +// TODO(bashi): Consider returning MaybeLocal.
|
| v8::Local<v8::Value> WebLocalFrameImpl::callFunctionEvenIfScriptDisabled(v8::Local<v8::Function> function, v8::Local<v8::Value> receiver, int argc, v8::Local<v8::Value> argv[])
|
| {
|
| ASSERT(frame());
|
| - // TODO(bashi): Change the signature of callFunctionEvenIfScriptDisabled()
|
| - // so that it takes v8::Local instead of v8::Handle.
|
| - return frame()->script().callFunction(function, receiver, argc, argv);
|
| + v8::Local<v8::Value> result;
|
| + if (!frame()->script().callFunction(function, receiver, argc, static_cast<v8::Local<v8::Value>*>(argv)).ToLocal(&result))
|
| + return v8::Local<v8::Value>();
|
| + return result;
|
| }
|
|
|
| v8::Local<v8::Context> WebLocalFrameImpl::mainWorldScriptContext() const
|
|
|