Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: fpdfsdk/include/javascript/global.h

Issue 1297723002: CFX_MapByteStringToPtr considered harmful. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Const auto& Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « fpdfsdk/include/fsdk_annothandler.h ('k') | fpdfsdk/src/fsdk_annothandler.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #ifndef FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_ 7 #ifndef FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
8 #define FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_ 8 #define FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
9 9
10 #include <map>
11
10 #include "JS_Define.h" 12 #include "JS_Define.h"
11 13
12 class CJS_GlobalData; 14 class CJS_GlobalData;
13 class CJS_GlobalVariableArray; 15 class CJS_GlobalVariableArray;
14 class CJS_KeyValue; 16 class CJS_KeyValue;
15 17
16 struct JSGlobalData { 18 struct JSGlobalData {
17 JSGlobalData() { 19 JSGlobalData() {
18 nType = 0; 20 nType = 0;
19 dData = 0; 21 dData = 0;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 bool bData, 64 bool bData,
63 const CFX_ByteString& sData, 65 const CFX_ByteString& sData,
64 JSObject pData, 66 JSObject pData,
65 bool bDefaultPersistent); 67 bool bDefaultPersistent);
66 68
67 void ObjectToArray(v8::Local<v8::Object> pObj, 69 void ObjectToArray(v8::Local<v8::Object> pObj,
68 CJS_GlobalVariableArray& array); 70 CJS_GlobalVariableArray& array);
69 void PutObjectProperty(v8::Local<v8::Object> obj, CJS_KeyValue* pData); 71 void PutObjectProperty(v8::Local<v8::Object> obj, CJS_KeyValue* pData);
70 72
71 private: 73 private:
72 CFX_MapByteStringToPtr m_mapGlobal; 74 std::map<CFX_ByteString, JSGlobalData*> m_mapGlobal;
73 CFX_WideString m_sFilePath; 75 CFX_WideString m_sFilePath;
74 CJS_GlobalData* m_pGlobalData; 76 CJS_GlobalData* m_pGlobalData;
75 CPDFDoc_Environment* m_pApp; 77 CPDFDoc_Environment* m_pApp;
76 }; 78 };
77 79
78 class CJS_Global : public CJS_Object { 80 class CJS_Global : public CJS_Object {
79 public: 81 public:
80 explicit CJS_Global(JSFXObject pObject) : CJS_Object(pObject) {} 82 explicit CJS_Global(JSFXObject pObject) : CJS_Object(pObject) {}
81 ~CJS_Global() override {} 83 ~CJS_Global() override {}
82 84
83 // CJS_Object 85 // CJS_Object
84 FX_BOOL InitInstance(IFXJS_Context* cc) override; 86 FX_BOOL InitInstance(IFXJS_Context* cc) override;
85 87
86 DECLARE_SPECIAL_JS_CLASS(CJS_Global); 88 DECLARE_SPECIAL_JS_CLASS(CJS_Global);
87 89
88 JS_SPECIAL_STATIC_METHOD(setPersistent, JSGlobalAlternate, global); 90 JS_SPECIAL_STATIC_METHOD(setPersistent, JSGlobalAlternate, global);
89 }; 91 };
90 92
91 #endif // FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_ 93 #endif // FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_
OLDNEW
« no previous file with comments | « fpdfsdk/include/fsdk_annothandler.h ('k') | fpdfsdk/src/fsdk_annothandler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698