diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-08 12:24:19 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-08 12:24:19 -0700 |
| commit | 67fd5df1a378195ae3fb40c862a4e6e58731020a (patch) | |
| tree | 498a4803209d78747f97ed514c45981df47de3e5 /fpdfsdk/src/javascript/global.h | |
| parent | 6d5649b46c73bde7de2488b5631ecbf0d4a3bb05 (diff) | |
| download | pdfium-67fd5df1a378195ae3fb40c862a4e6e58731020a.tar.xz | |
Merge to XFA: Wean CJS_Value off of v8::Isolate.
(cherry picked from commit 287b63d9ab410783d71cf37291f09fd57d3059b4)
Original Review URL: https://codereview.chromium.org/1394103002 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1394053003 .
Diffstat (limited to 'fpdfsdk/src/javascript/global.h')
| -rw-r--r-- | fpdfsdk/src/javascript/global.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fpdfsdk/src/javascript/global.h b/fpdfsdk/src/javascript/global.h index 5ae9c9f9db..30f5d07b31 100644 --- a/fpdfsdk/src/javascript/global.h +++ b/fpdfsdk/src/javascript/global.h @@ -56,7 +56,7 @@ class JSGlobalAlternate : public CJS_EmbedObj { private: void UpdateGlobalPersistentVariables(); - void CommitGlobalPersisitentVariables(); + void CommitGlobalPersisitentVariables(IJS_Context* cc); void DestroyGlobalPersisitentVariables(); FX_BOOL SetGlobalVariables(const FX_CHAR* propname, int nType, @@ -65,12 +65,11 @@ class JSGlobalAlternate : public CJS_EmbedObj { const CFX_ByteString& sData, v8::Local<v8::Object> pData, bool bDefaultPersistent); - - void ObjectToArray(v8::Local<v8::Object> pObj, + void ObjectToArray(IJS_Context* cc, + v8::Local<v8::Object> pObj, CJS_GlobalVariableArray& array); void PutObjectProperty(v8::Local<v8::Object> obj, CJS_KeyValue* pData); - private: std::map<CFX_ByteString, JSGlobalData*> m_mapGlobal; CFX_WideString m_sFilePath; CJS_GlobalData* m_pGlobalData; |