diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-10-09 13:14:47 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-10-09 13:14:47 -0700 |
| commit | 848a13b6777cbff8cc4aea3ab3d69eaa0b82ae6c (patch) | |
| tree | d2c3a5ee4f67227ac33199f6d10caaf204c92896 /fpdfsdk/src/fsdk_baseform.cpp | |
| parent | f1c713663192368d26031a4caed1f9705f4510af (diff) | |
| download | pdfium-848a13b6777cbff8cc4aea3ab3d69eaa0b82ae6c.tar.xz | |
Pass IJS_Runtime, not IJS_Context, to native object constructors.
This better separates the two IJS_ classes, with the IJS_Context
taking on its proper role of describing an event. There's no need
for the event details for object creation, so this gets much
cleaner.
Move some JS error reporting code from CJS_Context to CJS_Runtime.
Make InitInstance() and ExitInstance() voids, they always return
TRUE and we never check the result anyways.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1389163007 .
Diffstat (limited to 'fpdfsdk/src/fsdk_baseform.cpp')
| -rw-r--r-- | fpdfsdk/src/fsdk_baseform.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index ff71c2bcee..f6b6b14483 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -1418,8 +1418,7 @@ void CPDFSDK_Widget::AddImageToAppearance(const CFX_ByteString& sAPType, CPDF_Stream* pImage) { ASSERT(pImage != NULL); - CPDF_Document* pDoc = - m_pPageView->GetPDFDocument(); // pDocument->GetDocument(); + CPDF_Document* pDoc = m_pPageView->GetPDFDocument(); ASSERT(pDoc != NULL); CPDF_Dictionary* pAPDict = m_pAnnot->GetAnnotDict()->GetDict("AP"); @@ -1766,7 +1765,6 @@ void CPDFSDK_InterForm::OnCalculate(CPDF_FormField* pFormField) { for (int i = 0; i < nSize; i++) { if (CPDF_FormField* pField = m_pInterForm->GetFieldInCalculationOrder(i)) { - // ASSERT(pField != NULL); int nType = pField->GetFieldType(); if (nType == FIELDTYPE_COMBOBOX || nType == FIELDTYPE_TEXTFIELD) { CPDF_AAction aAction = pField->GetAdditionalAction(); @@ -1784,7 +1782,7 @@ void CPDFSDK_InterForm::OnCalculate(CPDF_FormField* pFormField) { pContext->OnField_Calculate(pFormField, pField, sValue, bRC); CFX_WideString sInfo; - FX_BOOL bRet = pContext->RunScript(csJS, sInfo); + FX_BOOL bRet = pContext->RunScript(csJS, &sInfo); pRuntime->ReleaseContext(pContext); if (bRet) { @@ -1846,7 +1844,7 @@ CFX_WideString CPDFSDK_InterForm::OnFormat(CPDF_FormField* pFormField, pContext->OnField_Format(pFormField, Value, TRUE); CFX_WideString sInfo; - FX_BOOL bRet = pContext->RunScript(script, sInfo); + FX_BOOL bRet = pContext->RunScript(script, &sInfo); pRuntime->ReleaseContext(pContext); if (bRet) { @@ -2144,7 +2142,7 @@ FX_BOOL CPDFSDK_InterForm::ExportFieldsToFDFTextBuf(const CFX_PtrArray& fields, m_pDocument->GetPath(), (CFX_PtrArray&)fields, bIncludeOrExclude); if (!pFDF) return FALSE; - FX_BOOL bRet = pFDF->WriteBuf(textBuf); // = FALSE;// + FX_BOOL bRet = pFDF->WriteBuf(textBuf); delete pFDF; return bRet; |