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 /fpdfsdk/include/javascript/global.h | |
| 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 'fpdfsdk/include/javascript/global.h')
| -rw-r--r-- | fpdfsdk/include/javascript/global.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fpdfsdk/include/javascript/global.h b/fpdfsdk/include/javascript/global.h index 9ee9f42b42..2690f6822c 100644 --- a/fpdfsdk/include/javascript/global.h +++ b/fpdfsdk/include/javascript/global.h @@ -33,7 +33,7 @@ struct js_global_data double dData; bool bData; CFX_ByteString sData; - v8::Persistent<v8::Object> pData; + v8::Global<v8::Object> pData; bool bPersistent; bool bDeleted; }; @@ -61,8 +61,8 @@ private: FX_BOOL SetGlobalVariables(FX_LPCSTR propname, int nType, double dData, bool bData, const CFX_ByteString& sData, JSObject pData, bool bDefaultPersistent); - void ObjectToArray(v8::Handle<v8::Object> pObj, CJS_GlobalVariableArray& array); - void PutObjectProperty(v8::Handle<v8::Object> obj, CJS_KeyValue* pData); + void ObjectToArray(v8::Local<v8::Object> pObj, CJS_GlobalVariableArray& array); + void PutObjectProperty(v8::Local<v8::Object> obj, CJS_KeyValue* pData); private: CFX_MapByteStringToPtr m_mapGlobal; |