From ccb2b296ac62b79efab128d51addcba262fe6005 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 28 Sep 2012 17:45:46 +0000 Subject: [PATCH] Fix assertion when executing V8 callbacks during extension load (issue #712). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@821 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- libcef/renderer/v8_impl.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libcef/renderer/v8_impl.cc b/libcef/renderer/v8_impl.cc index c7a3c71e9..1dfc608a0 100644 --- a/libcef/renderer/v8_impl.cc +++ b/libcef/renderer/v8_impl.cc @@ -213,7 +213,7 @@ void GetCefString(v8::Handle str, CefString& out) { v8::Handle FunctionCallbackImpl(const v8::Arguments& args) { v8::HandleScope handle_scope; WebCore::V8RecursionScope recursion_scope( - WebCore::getScriptExecutionContext()); + WebCore::toScriptExecutionContext(v8::Context::GetCurrent())); CefV8Handler* handler = static_cast(v8::External::Unwrap(args.Data())); @@ -247,7 +247,7 @@ v8::Handle AccessorGetterCallbackImpl(v8::Local property, const v8::AccessorInfo& info) { v8::HandleScope handle_scope; WebCore::V8RecursionScope recursion_scope( - WebCore::getScriptExecutionContext()); + WebCore::toScriptExecutionContext(v8::Context::GetCurrent())); v8::Handle obj = info.This(); @@ -282,7 +282,7 @@ void AccessorSetterCallbackImpl(v8::Local property, const v8::AccessorInfo& info) { v8::HandleScope handle_scope; WebCore::V8RecursionScope recursion_scope( - WebCore::getScriptExecutionContext()); + WebCore::toScriptExecutionContext(v8::Context::GetCurrent())); v8::Handle obj = info.This();