diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-08-14 18:22:06 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-14 18:22:06 +0000 |
| commit | b9c3e2712f75363372622282023143b86b72f2df (patch) | |
| tree | b8b4443fbf792143ade73b0fdd2ccf3e50c9a1e1 /fxjs | |
| parent | f46d49b52d39f8a56e40a95e0d9d2b574301fa04 (diff) | |
| download | pdfium-b9c3e2712f75363372622282023143b86b72f2df.tar.xz | |
Remove more default arg = nullptr cases.
Bring in line with standards.
Remove argument entirely for mac code that is always nullptr.
Change-Id: I0710bdbd51fc0bc2e1d428ef44976be39a631147
Reviewed-on: https://pdfium-review.googlesource.com/40091
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'fxjs')
| -rw-r--r-- | fxjs/cfxjse_context.h | 2 | ||||
| -rw-r--r-- | fxjs/cfxjse_engine.cpp | 3 | ||||
| -rw-r--r-- | fxjs/cfxjse_formcalc_context.cpp | 3 | ||||
| -rw-r--r-- | fxjs/cjs_document.cpp | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/fxjs/cfxjse_context.h b/fxjs/cfxjse_context.h index 5a299428ab..2e47adb65f 100644 --- a/fxjs/cfxjse_context.h +++ b/fxjs/cfxjse_context.h @@ -37,7 +37,7 @@ class CFXJSE_Context { void EnableCompatibleMode(); bool ExecuteScript(const char* szScript, CFXJSE_Value* lpRetValue, - CFXJSE_Value* lpNewThisObject = nullptr); + CFXJSE_Value* lpNewThisObject); private: CFXJSE_Context(const CFXJSE_Context&) = delete; diff --git a/fxjs/cfxjse_engine.cpp b/fxjs/cfxjse_engine.cpp index bf5778bf9a..ef6212e3f3 100644 --- a/fxjs/cfxjse_engine.cpp +++ b/fxjs/cfxjse_engine.cpp @@ -514,7 +514,8 @@ bool CFXJSE_Engine::RunVariablesScript(CXFA_Node* pScriptNode) { CreateVariablesContext(pScriptNode, pThisObject); AutoRestorer<CXFA_Object*> nodeRestorer(&m_pThisObject); m_pThisObject = pThisObject; - return pVariablesContext->ExecuteScript(btScript.c_str(), hRetValue.get()); + return pVariablesContext->ExecuteScript(btScript.c_str(), hRetValue.get(), + nullptr); } bool CFXJSE_Engine::QueryVariableValue(CXFA_Node* pScriptNode, diff --git a/fxjs/cfxjse_formcalc_context.cpp b/fxjs/cfxjse_formcalc_context.cpp index a2773b27d0..0eee3d4de5 100644 --- a/fxjs/cfxjse_formcalc_context.cpp +++ b/fxjs/cfxjse_formcalc_context.cpp @@ -3429,7 +3429,8 @@ void CFXJSE_FormCalcContext::Eval(CFXJSE_Value* pThis, auto returnValue = pdfium::MakeUnique<CFXJSE_Value>(pIsolate); pNewContext->ExecuteScript( - FX_UTF8Encode(wsJavaScriptBuf.AsStringView()).c_str(), returnValue.get()); + FX_UTF8Encode(wsJavaScriptBuf.AsStringView()).c_str(), returnValue.get(), + nullptr); args.GetReturnValue()->Assign(returnValue.get()); } diff --git a/fxjs/cjs_document.cpp b/fxjs/cjs_document.cpp index b135805363..fa9826d1ae 100644 --- a/fxjs/cjs_document.cpp +++ b/fxjs/cjs_document.cpp @@ -1199,7 +1199,7 @@ CJS_Return CJS_Document::calculateNow( return CJS_Return(JSMessage::kPermissionError); } - m_pFormFillEnv->GetInterForm()->OnCalculate(); + m_pFormFillEnv->GetInterForm()->OnCalculate(nullptr); return CJS_Return(); } |