diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-08-19 09:49:24 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-08-19 09:49:24 -0700 |
| commit | 09d33bcd82a82cb55039d41651df13e17d6c3e59 (patch) | |
| tree | 7a748b7570ff6ad0321c4334319bac101da0e6af /fpdfsdk/include/javascript | |
| parent | 1b0023986bc22ce362097b25deb9746b693ef235 (diff) | |
| download | pdfium-09d33bcd82a82cb55039d41651df13e17d6c3e59.tar.xz | |
Merge to XFA: CFX_MapByteStringToPtr considered harmful (combo patch).
New manual edits: two unused members deleted, one adapted.
fde_csscache.cpp
fde_csscache.h
fpdfxfa_doc.h
fx_ge_fontmap.cpp
(cherry picked from commit 1d9dbd53b205b2b4d9e75a7eeb95e80837917ea3)
(cherry picked from commit cb4d0ea68308e3c51a6ba9551b393bb2f639afc4)
(cherry picked from commit 9cf44c2ed09a8b2ff243eb6dbb72a8cceae1b5ff)
(cherry picked from commit 2a2a6aa7f51352fc481e78f6ad9d41f2738bcc48)
(cherry picked from commit ce4ffb8183af3fa2bb5133f0f7370a88e064c516)
Original Review URL: https://codereview.chromium.org/1297723002 .
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1301793002 .
Diffstat (limited to 'fpdfsdk/include/javascript')
| -rw-r--r-- | fpdfsdk/include/javascript/global.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fpdfsdk/include/javascript/global.h b/fpdfsdk/include/javascript/global.h index e881625f56..7f78bb6bcb 100644 --- a/fpdfsdk/include/javascript/global.h +++ b/fpdfsdk/include/javascript/global.h @@ -7,6 +7,8 @@ #ifndef FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_ #define FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_ +#include <map> + #include "JS_Define.h" class CJS_GlobalData; @@ -69,7 +71,7 @@ class JSGlobalAlternate : public CJS_EmbedObj { void PutObjectProperty(v8::Local<v8::Object> obj, CJS_KeyValue* pData); private: - CFX_MapByteStringToPtr m_mapGlobal; + std::map<CFX_ByteString, JSGlobalData*> m_mapGlobal; CFX_WideString m_sFilePath; CJS_GlobalData* m_pGlobalData; CPDFDoc_Environment* m_pApp; |