diff options
author | Jochen Eisinger <jochen@chromium.org> | 2015-05-19 00:38:00 +0200 |
---|---|---|
committer | Jochen Eisinger <jochen@chromium.org> | 2015-05-19 00:38:00 +0200 |
commit | dfa2c9939a85ad1c01ef858b21942ab3773dcf27 (patch) | |
tree | 064ae26fd633fe7ffcc6c72ce59bd2cfdd429246 /xfa/src/fxjse/src/context.cpp | |
parent | 34d839653f3c7a821dadb8e3219f9a8da83d83e6 (diff) | |
download | pdfium-dfa2c9939a85ad1c01ef858b21942ab3773dcf27.tar.xz |
Merge V8 API updates to xfa branch
Set pointers in internal fields directly instead of wrapping them
Review URL: https://codereview.chromium.org/1139853003
Use phantom handles instead of weak handles
Review URL: https://codereview.chromium.org/1129253004
Replace deprecated with non-deprecated V8 APIs
Review URL: https://codereview.chromium.org/1126203010
Add myself to OWNERS file
Review URL: https://codereview.chromium.org/1133333005
Replace v8::Handle with v8::Local and v8::Persistent with v8::Global
Review URL: https://codereview.chromium.org/1138823004
TBR=tsepez@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1140033004
Diffstat (limited to 'xfa/src/fxjse/src/context.cpp')
-rw-r--r-- | xfa/src/fxjse/src/context.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xfa/src/fxjse/src/context.cpp b/xfa/src/fxjse/src/context.cpp index f2d979ee55..d78729fc35 100644 --- a/xfa/src/fxjse/src/context.cpp +++ b/xfa/src/fxjse/src/context.cpp @@ -63,12 +63,12 @@ FX_BOOL FXJSE_ExecuteScript(FXJSE_HCONTEXT hContext, FX_LPCSTR szScript, FXJSE_H ASSERT(pContext);
return pContext->ExecuteScript(szScript, reinterpret_cast<CFXJSE_Value*>(hRetValue), reinterpret_cast<CFXJSE_Value*>(hNewThisObject));
}
-v8::Handle<v8::Object> FXJSE_CreateReturnValue(v8::Isolate* pIsolate, v8::TryCatch& trycatch)
+v8::Local<v8::Object> FXJSE_CreateReturnValue(v8::Isolate* pIsolate, v8::TryCatch& trycatch)
{
- v8::Handle<v8::Object> hReturnValue = v8::Object::New(pIsolate);
+ v8::Local<v8::Object> hReturnValue = v8::Object::New(pIsolate);
if (trycatch.HasCaught()) {
- v8::Handle<v8::Value> hException = trycatch.Exception();
- v8::Handle<v8::Message> hMessage = trycatch.Message();
+ v8::Local<v8::Value> hException = trycatch.Exception();
+ v8::Local<v8::Message> hMessage = trycatch.Message();
if (hException->IsObject()) {
v8::Local<v8::Value> hValue;
hValue = hException.As<v8::Object>()->Get(v8::String::NewFromUtf8(pIsolate, "name"));
@@ -207,7 +207,7 @@ FX_BOOL CFXJSE_Context::ExecuteScript(FX_LPCSTR szScript, CFXJSE_Value* lpRetVal ASSERT(hWrapperValue->IsFunction());
v8::Local<v8::Function> hWrapperFn = hWrapperValue.As<v8::Function>();
if(!trycatch.HasCaught()) {
- v8::Handle<v8::Value> rgArgs[] = {hScriptString};
+ v8::Local<v8::Value> rgArgs[] = {hScriptString};
v8::Local<v8::Value> hValue = hWrapperFn->Call(hNewThis.As<v8::Object>(), 1, rgArgs);
if(!trycatch.HasCaught()) {
if(lpRetValue) {
|