Chromium Code Reviews| Index: fpdfsdk/javascript/app.cpp |
| diff --git a/fpdfsdk/javascript/app.cpp b/fpdfsdk/javascript/app.cpp |
| index 10776292442dd5b798112ecfe316bcd4af629f2f..d924c39d48f0d35d85102ee9bfe7950b1ba2bd8d 100644 |
| --- a/fpdfsdk/javascript/app.cpp |
| +++ b/fpdfsdk/javascript/app.cpp |
| @@ -113,7 +113,7 @@ FX_BOOL app::activeDocs(IJS_Context* cc, |
| CPDFDoc_Environment* pApp = pContext->GetReaderApp(); |
| CJS_Runtime* pRuntime = pContext->GetJSRuntime(); |
| CPDFSDK_Document* pCurDoc = pContext->GetReaderDocument(); |
| - CJS_Array aDocs(pRuntime); |
| + CJS_Array aDocs; |
| if (CPDFSDK_Document* pDoc = pApp->GetSDKDocument()) { |
| CJS_Document* pJSDocument = nullptr; |
| if (pDoc == pCurDoc) { |
| @@ -128,7 +128,8 @@ FX_BOOL app::activeDocs(IJS_Context* cc, |
| (CJS_Document*)FXJS_GetPrivate(pRuntime->GetIsolate(), pObj); |
| ASSERT(pJSDocument); |
| } |
| - aDocs.SetElement(0, CJS_Value(pRuntime, pJSDocument)); |
| + aDocs.SetElement(pRuntime->GetIsolate(), 0, |
| + CJS_Value(pRuntime, pJSDocument)); |
| } |
| if (aDocs.GetLength() > 0) |
| vp << aDocs; |
| @@ -148,8 +149,8 @@ FX_BOOL app::calculate(IJS_Context* cc, |
| CJS_Context* pContext = (CJS_Context*)cc; |
| CPDFDoc_Environment* pApp = pContext->GetReaderApp(); |
| - CJS_Runtime* pRuntime = pContext->GetJSRuntime(); |
| - CJS_Array aDocs(pRuntime); |
| + // CJS_Runtime* pRuntime = pContext->GetJSRuntime(); |
|
Lei Zhang
2016/08/05 17:41:58
Delete?
Tom Sepez
2016/08/08 16:25:50
Done.
|
| + CJS_Array aDocs; |
| if (CPDFSDK_Document* pDoc = pApp->GetSDKDocument()) |
| pDoc->GetInterForm()->EnableCalculate((FX_BOOL)m_bCalculate); |
| } else { |
| @@ -288,14 +289,14 @@ FX_BOOL app::alert(IJS_Context* cc, |
| CFX_WideString swMsg; |
| if (newParams[0].GetType() == CJS_Value::VT_object) { |
| - CJS_Array carray(pRuntime); |
| + CJS_Array carray; |
| if (newParams[0].ConvertToArray(carray)) { |
| swMsg = L"["; |
| CJS_Value element(pRuntime); |
| for (int i = 0; i < carray.GetLength(); ++i) { |
| if (i) |
| swMsg += L", "; |
| - carray.GetElement(i, element); |
| + carray.GetElement(pRuntime->GetIsolate(), i, element); |
| swMsg += element.ToCFXWideString(); |
| } |
| swMsg += L"]"; |