summaryrefslogtreecommitdiff
path: root/fxjs/cfxjse_context.cpp
diff options
context:
space:
mode:
authorAdam Klein <adamk@chromium.org>2018-01-22 17:53:56 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-01-22 17:53:56 +0000
commit434e28dd41e37dc829440aab1eb4cb4ec561962b (patch)
tree3fe7c26d9e4e9d34b0883c11214ab3fb2f93efd8 /fxjs/cfxjse_context.cpp
parent1fa1b1f771dd077b0fb4056c7b84f701ba733a8c (diff)
downloadpdfium-434e28dd41e37dc829440aab1eb4cb4ec561962b.tar.xz
Use MaybeLocal versions of v8::Script APIs
The non-Maybe versions will soon be deprecated. Where the code was already handling failures, I did the same; where the code was not handling failures, I inserted ToLocalChecked() calls. Thus the behavior before and after this patch should be the same. For consistency, also updated the use of v8::Function::Call in CFXJSE_Context::ExecuteScript() to the Maybe version, so that all code in that function now branches on the non-emptyness of MaybeLocals, rather than TryCatch::HasCaught(). ASSERTs were inserted to sanity-check the API usage. Bug: v8:7269, v8:7273, v8:7274 Change-Id: I59696e63a64a233a9f9c2b72c621a05b5e349a31 Reviewed-on: https://pdfium-review.googlesource.com/23270 Commit-Queue: Jochen Eisinger <jochen@chromium.org> Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Diffstat (limited to 'fxjs/cfxjse_context.cpp')
-rw-r--r--fxjs/cfxjse_context.cpp34
1 files changed, 21 insertions, 13 deletions
diff --git a/fxjs/cfxjse_context.cpp b/fxjs/cfxjse_context.cpp
index bf9bee8652..5c85cfd5b1 100644
--- a/fxjs/cfxjse_context.cpp
+++ b/fxjs/cfxjse_context.cpp
@@ -228,14 +228,17 @@ bool CFXJSE_Context::ExecuteScript(const char* szScript,
CFXJSE_Value* lpRetValue,
CFXJSE_Value* lpNewThisObject) {
CFXJSE_ScopeUtil_IsolateHandleContext scope(this);
+ v8::Local<v8::Context> hContext = m_pIsolate->GetCurrentContext();
v8::TryCatch trycatch(m_pIsolate);
v8::Local<v8::String> hScriptString =
v8::String::NewFromUtf8(m_pIsolate, szScript);
if (!lpNewThisObject) {
- v8::Local<v8::Script> hScript = v8::Script::Compile(hScriptString);
- if (!trycatch.HasCaught()) {
- v8::Local<v8::Value> hValue = hScript->Run();
- if (!trycatch.HasCaught()) {
+ v8::Local<v8::Script> hScript;
+ if (v8::Script::Compile(hContext, hScriptString).ToLocal(&hScript)) {
+ ASSERT(!trycatch.HasCaught());
+ v8::Local<v8::Value> hValue;
+ if (hScript->Run(hContext).ToLocal(&hValue)) {
+ ASSERT(!trycatch.HasCaught());
if (lpRetValue)
lpRetValue->m_hValue.Reset(m_pIsolate, hValue);
return true;
@@ -251,16 +254,21 @@ bool CFXJSE_Context::ExecuteScript(const char* szScript,
v8::Local<v8::Value> hNewThis =
v8::Local<v8::Value>::New(m_pIsolate, lpNewThisObject->m_hValue);
ASSERT(!hNewThis.IsEmpty());
- v8::Local<v8::Script> hWrapper = v8::Script::Compile(v8::String::NewFromUtf8(
- m_pIsolate, "(function () { return eval(arguments[0]); })"));
- v8::Local<v8::Value> hWrapperValue = hWrapper->Run();
- ASSERT(hWrapperValue->IsFunction());
- v8::Local<v8::Function> hWrapperFn = hWrapperValue.As<v8::Function>();
- if (!trycatch.HasCaught()) {
+ v8::Local<v8::Script> hWrapper =
+ v8::Script::Compile(
+ hContext,
+ v8::String::NewFromUtf8(
+ m_pIsolate, "(function () { return eval(arguments[0]); })"))
+ .ToLocalChecked();
+ v8::Local<v8::Value> hWrapperValue;
+ if (hWrapper->Run(hContext).ToLocal(&hWrapperValue)) {
+ ASSERT(!trycatch.HasCaught());
+ v8::Local<v8::Function> hWrapperFn = hWrapperValue.As<v8::Function>();
v8::Local<v8::Value> rgArgs[] = {hScriptString};
- v8::Local<v8::Value> hValue =
- hWrapperFn->Call(hNewThis.As<v8::Object>(), 1, rgArgs);
- if (!trycatch.HasCaught()) {
+ v8::Local<v8::Value> hValue;
+ if (hWrapperFn->Call(hContext, hNewThis.As<v8::Object>(), 1, rgArgs)
+ .ToLocal(&hValue)) {
+ ASSERT(!trycatch.HasCaught());
if (lpRetValue)
lpRetValue->m_hValue.Reset(m_pIsolate, hValue);
return true;