From cd5dc855df0ca37b7667b5f3ceb951d2d417d99f Mon Sep 17 00:00:00 2001 From: tsepez Date: Thu, 8 Sep 2016 11:23:24 -0700 Subject: Remove unused context parameter from JSGetStringFromID Clean up before using IDS_STRING_JSBADOBJECT in nearly all JS callbacks, which will happen in the next CL when we watch C-side object destruction. Add a "no permission" message as well. Review-Url: https://codereview.chromium.org/2319543003 --- fpdfsdk/javascript/global.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'fpdfsdk/javascript/global.cpp') diff --git a/fpdfsdk/javascript/global.cpp b/fpdfsdk/javascript/global.cpp index 27c156e527..c0330f3a14 100644 --- a/fpdfsdk/javascript/global.cpp +++ b/fpdfsdk/javascript/global.cpp @@ -161,13 +161,12 @@ FX_BOOL JSGlobalAlternate::setPersistent(IJS_Context* cc, const std::vector& params, CJS_Value& vRet, CFX_WideString& sError) { - CJS_Context* pContext = static_cast(cc); - CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc); if (params.size() != 2) { - sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR); + sError = JSGetStringFromID(IDS_STRING_JSPARAMERROR); return FALSE; } + CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc); auto it = m_mapGlobal.find(params[0].ToCFXByteString(pRuntime)); if (it != m_mapGlobal.end()) { JSGlobalData* pData = it->second; @@ -177,7 +176,7 @@ FX_BOOL JSGlobalAlternate::setPersistent(IJS_Context* cc, } } - sError = JSGetStringFromID(pContext, IDS_STRING_JSNOGLOBAL); + sError = JSGetStringFromID(IDS_STRING_JSNOGLOBAL); return FALSE; } -- cgit v1.2.3