diff options
| author | tsepez <tsepez@chromium.org> | 2016-05-26 12:39:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-26 12:39:34 -0700 |
| commit | e3b2a4eca66e357df663a6f7464ef9af5e85883f (patch) | |
| tree | b4d591b227e69f9652605fa941611c651e8d6fa4 /xfa/fxfa/fm2js | |
| parent | 60607c3baaf52574cab748a97c213e447c9108c0 (diff) | |
| download | pdfium-e3b2a4eca66e357df663a6f7464ef9af5e85883f.tar.xz | |
Rename FXJSE_CLASS to avoid confusion with CFXJSE_CLASS
BUG=
Review-Url: https://codereview.chromium.org/2010013003
Diffstat (limited to 'xfa/fxfa/fm2js')
| -rw-r--r-- | xfa/fxfa/fm2js/xfa_fm2jscontext.cpp | 18 | ||||
| -rw-r--r-- | xfa/fxfa/fm2js/xfa_fm2jscontext.h | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp index 7e5ddb9aec..9de77cb0b9 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.cpp @@ -7072,7 +7072,7 @@ void CXFA_FM2JSContext::ValueToUTF8String(CFXJSE_Value* arg, FXJSE_Value_ToUTF8String(arg, szOutputString); } } -static FXJSE_FUNCTION formcalc_fm2js_functions[] = { +static FXJSE_FUNCTION_DESCRIPTOR formcalc_fm2js_functions[] = { {"Abs", CXFA_FM2JSContext::Abs}, {"Avg", CXFA_FM2JSContext::Avg}, {"Ceil", CXFA_FM2JSContext::Ceil}, @@ -7167,7 +7167,7 @@ static FXJSE_FUNCTION formcalc_fm2js_functions[] = { }; CXFA_FM2JSContext::CXFA_FM2JSContext() : m_pFMClass(nullptr), m_pDocument(nullptr) { - FXSYS_memset(&m_fmClass, 0, sizeof(FXJSE_CLASS)); + FXSYS_memset(&m_ClassDescriptor, 0, sizeof(FXJSE_CLASS_DESCRIPTOR)); } CXFA_FM2JSContext::~CXFA_FM2JSContext() { @@ -7180,14 +7180,14 @@ void CXFA_FM2JSContext::Initialize(v8::Isolate* pScriptIsolate, CXFA_Document* pDoc) { m_pDocument = pDoc; m_pIsolate = pScriptIsolate; - m_fmClass.name = "XFA_FM2JS_FormCalcClass"; - m_fmClass.constructor = NULL; - m_fmClass.properties = NULL; - m_fmClass.methods = formcalc_fm2js_functions; - m_fmClass.propNum = 0; - m_fmClass.methNum = + m_ClassDescriptor.name = "XFA_FM2JS_FormCalcClass"; + m_ClassDescriptor.constructor = NULL; + m_ClassDescriptor.properties = NULL; + m_ClassDescriptor.methods = formcalc_fm2js_functions; + m_ClassDescriptor.propNum = 0; + m_ClassDescriptor.methNum = sizeof(formcalc_fm2js_functions) / sizeof(formcalc_fm2js_functions[0]); - m_pFMClass = FXJSE_DefineClass(pScriptContext, &m_fmClass); + m_pFMClass = FXJSE_DefineClass(pScriptContext, &m_ClassDescriptor); m_pValue = FXJSE_Value_Create(pScriptIsolate); FXJSE_Value_SetNull(m_pValue); FXJSE_Value_SetObject(m_pValue, this, m_pFMClass); diff --git a/xfa/fxfa/fm2js/xfa_fm2jscontext.h b/xfa/fxfa/fm2js/xfa_fm2jscontext.h index fc1a111a80..fa0c2c31e3 100644 --- a/xfa/fxfa/fm2js/xfa_fm2jscontext.h +++ b/xfa/fxfa/fm2js/xfa_fm2jscontext.h @@ -447,7 +447,7 @@ class CXFA_FM2JSContext { private: v8::Isolate* m_pIsolate; - FXJSE_CLASS m_fmClass; + FXJSE_CLASS_DESCRIPTOR m_ClassDescriptor; CFXJSE_Class* m_pFMClass; CFXJSE_Value* m_pValue; CXFA_Document* m_pDocument; |