From 7e6a8484b05819268b4e7f0350cebfb704c6d18c Mon Sep 17 00:00:00 2001 From: jochen Date: Wed, 6 Jul 2016 11:02:27 -0700 Subject: Roll DEPS for v8 to 820a23aa. Also roll DEPS for ICU to ffa4b670 and add a needed GYP variable. BUG= R=thestig@chromium.org Review-Url: https://codereview.chromium.org/2127553004 --- fxjse/context.cpp | 4 ++++ fxjse/runtime.cpp | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'fxjse') diff --git a/fxjse/context.cpp b/fxjse/context.cpp index 3ecc3e2321..9c43830997 100644 --- a/fxjse/context.cpp +++ b/fxjse/context.cpp @@ -141,6 +141,10 @@ CFXJSE_Context* CFXJSE_Context::Create( hObjectTemplate = v8::ObjectTemplate::New(pIsolate); hObjectTemplate->SetInternalFieldCount(1); } + hObjectTemplate->Set( + v8::Symbol::GetToStringTag(pIsolate), + v8::String::NewFromUtf8(pIsolate, "global", v8::NewStringType::kNormal) + .ToLocalChecked()); v8::Local hNewContext = v8::Context::New(pIsolate, NULL, hObjectTemplate); v8::Local hRootContext = v8::Local::New( diff --git a/fxjse/runtime.cpp b/fxjse/runtime.cpp index 29814bdc7e..b5f2f33a75 100644 --- a/fxjse/runtime.cpp +++ b/fxjse/runtime.cpp @@ -79,8 +79,14 @@ CFXJSE_RuntimeData* CFXJSE_RuntimeData::Create(v8::Isolate* pIsolate) { CFXJSE_ScopeUtil_IsolateHandle scope(pIsolate); v8::Local hFuncTemplate = v8::FunctionTemplate::New(pIsolate); + v8::Local hGlobalTemplate = + hFuncTemplate->InstanceTemplate(); + hGlobalTemplate->Set( + v8::Symbol::GetToStringTag(pIsolate), + v8::String::NewFromUtf8(pIsolate, "global", v8::NewStringType::kNormal) + .ToLocalChecked()); v8::Local hContext = - v8::Context::New(pIsolate, 0, hFuncTemplate->InstanceTemplate()); + v8::Context::New(pIsolate, 0, hGlobalTemplate); hContext->SetSecurityToken(v8::External::New(pIsolate, pIsolate)); pRuntimeData->m_hRootContextGlobalTemplate.Reset(pIsolate, hFuncTemplate); pRuntimeData->m_hRootContext.Reset(pIsolate, hContext); -- cgit v1.2.3