bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 251746.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1628 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-02-19 16:27:54 +00:00
parent 4b75a68f9b
commit 5b6086ffb3
26 changed files with 105 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libcef/renderer/frame_impl.cc
View File

@ -18,6 +18,7 @@
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebView.h"
#include "third_party/WebKit/public/web/WebScriptSource.h"
@ -238,9 +239,9 @@ CefRefPtr<CefV8Context> CefFrameImpl::GetV8Context() {
CEF_REQUIRE_RT_RETURN(NULL);
if (frame_) {
v8::Isolate* isolate = webkit_glue::GetV8Isolate(frame_);
v8::Isolate* isolate = blink::mainThreadIsolate();
v8::HandleScope handle_scope(isolate);
return new CefV8ContextImpl(isolate, webkit_glue::GetV8Context(frame_));
return new CefV8ContextImpl(isolate, frame_->mainWorldScriptContext());
} else {
return NULL;
}