diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-08-17 12:15:26 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-08-17 12:15:26 -0700 |
| commit | 7dc5cc1c18e04375c19b9793c9da5864660a22f9 (patch) | |
| tree | 2c49a5b2b6888ed15a3c93568e5ee906d7853583 /fpdfsdk/include/javascript/global.h | |
| parent | 0998538c4a5ad116caf020aa2bd82bd32a6f7772 (diff) | |
| download | pdfium-7dc5cc1c18e04375c19b9793c9da5864660a22f9.tar.xz | |
Merge to XFA: js_global_data and global_alternate violate naming rules.
(cherry picked from commit ed7599b9042169f11b00f1126bfd3aff0f56b35f)
Original Review URL: https://codereview.chromium.org/1289903004 .
R=thestig@chromium.org
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1286083005 .
Diffstat (limited to 'fpdfsdk/include/javascript/global.h')
| -rw-r--r-- | fpdfsdk/include/javascript/global.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/fpdfsdk/include/javascript/global.h b/fpdfsdk/include/javascript/global.h index 369956749b..e881625f56 100644 --- a/fpdfsdk/include/javascript/global.h +++ b/fpdfsdk/include/javascript/global.h @@ -13,8 +13,8 @@ class CJS_GlobalData; class CJS_GlobalVariableArray; class CJS_KeyValue; -struct js_global_data { - js_global_data() { +struct JSGlobalData { + JSGlobalData() { nType = 0; dData = 0; bData = FALSE; @@ -23,7 +23,7 @@ struct js_global_data { bDeleted = FALSE; } - ~js_global_data() { pData.Reset(); } + ~JSGlobalData() { pData.Reset(); } int nType; // 0:int 1:bool 2:string 3:obj double dData; bool bData; @@ -33,18 +33,15 @@ struct js_global_data { bool bDeleted; }; -class global_alternate : public CJS_EmbedObj { +class JSGlobalAlternate : public CJS_EmbedObj { public: - global_alternate(CJS_Object* pJSObject); - ~global_alternate() override; + JSGlobalAlternate(CJS_Object* pJSObject); + ~JSGlobalAlternate() override; - public: FX_BOOL setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError); - - public: FX_BOOL QueryProperty(const FX_WCHAR* propname); FX_BOOL DoProperty(IFXJS_Context* cc, const FX_WCHAR* propname, @@ -53,7 +50,6 @@ class global_alternate : public CJS_EmbedObj { FX_BOOL DelProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CFX_WideString& sError); - void Initial(CPDFDoc_Environment* pApp); private: @@ -89,7 +85,7 @@ class CJS_Global : public CJS_Object { DECLARE_SPECIAL_JS_CLASS(CJS_Global); - JS_SPECIAL_STATIC_METHOD(setPersistent, global_alternate, global); + JS_SPECIAL_STATIC_METHOD(setPersistent, JSGlobalAlternate, global); }; #endif // FPDFSDK_INCLUDE_JAVASCRIPT_GLOBAL_H_ |