| Index: Source/web/WebPluginContainerImpl.cpp
|
| diff --git a/Source/web/WebPluginContainerImpl.cpp b/Source/web/WebPluginContainerImpl.cpp
|
| index fda1c6fe9b014952a36ae33669cab331906fb9df..345eff5e97447b5ef2ed7a8101f562e9aa2d1248 100644
|
| --- a/Source/web/WebPluginContainerImpl.cpp
|
| +++ b/Source/web/WebPluginContainerImpl.cpp
|
| @@ -437,13 +437,12 @@
|
| kurl.string().substring(strlen("javascript:")));
|
|
|
| UserGestureIndicator gestureIndicator(popupsAllowed ? DefinitelyProcessingNewUserGesture : PossiblyProcessingUserGesture);
|
| - v8::HandleScope handleScope(toIsolate(frame));
|
| - v8::Local<v8::Value> result = frame->script().executeScriptInMainWorldAndReturnValue(ScriptSourceCode(script));
|
| + ScriptValue result = frame->script().executeScriptInMainWorldAndReturnValue(ScriptSourceCode(script));
|
|
|
| // Failure is reported as a null string.
|
| - if (result.IsEmpty() || !result->IsString())
|
| - return WebString();
|
| - return toCoreString(v8::Handle<v8::String>::Cast(result));
|
| + String resultString;
|
| + result.toString(resultString);
|
| + return resultString;
|
| }
|
|
|
| void WebPluginContainerImpl::loadFrameRequest(const WebURLRequest& request, const WebString& target, bool notifyNeeded, void* notifyData)
|
|
|