Pass IJS_Runtime, not IJS_Context, to native object constructors.

fpdfsdk/src/fsdk_actionhandler.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../include/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fsdk_actionhandler.h"
 #include "../include/javascript/IJavaScript.h"
@@ skipping 141 matching lines @@
         ASSERT(pRuntime != NULL);
 
         pRuntime->SetReaderDocument(pDocument);
 
         IJS_Context* pContext = pRuntime->NewContext();
         ASSERT(pContext != NULL);
 
         pContext->OnLink_MouseUp(pDocument);
 
         CFX_WideString csInfo;
-        FX_BOOL bRet = pContext->RunScript(swJS, csInfo);
+        FX_BOOL bRet = pContext->RunScript(swJS, &csInfo);
         if (!bRet) {
           // FIXME: return error.
         }
 
         pRuntime->ReleaseContext(pContext);
       }
     }
   } else {
     DoAction_NoJs(action, pDocument);
   }
@@ skipping 167 matching lines @@
         //                      case CPDF_AAction::PageInvisible:
         //                              pContext->OnScreen_OutView(IsCTRLpressed(),
         // IsSHIFTpressed(), pScreen);
         //                              break;
         //                      default:
         //                              ASSERT(FALSE);
         //                              break;
         //                      }
 
         CFX_WideString csInfo;
-        FX_BOOL bRet = pContext->RunScript(swJS, csInfo);
+        FX_BOOL bRet = pContext->RunScript(swJS, &csInfo);
         if (!bRet) {
           // CBCL_FormNotify::MsgBoxJSError(pPageView->GetPageViewWnd(),

[Lei Zhang, 2015/10/09 01:09:29]

I wish I didn't see this. Feel free to deal with it later.

           // csInfo);
         }
 
         pRuntime->ReleaseContext(pContext);
       }
     }
   } else {
     DoAction_NoJs(action, pDocument);
   }
 
@@ skipping 28 matching lines @@
         ASSERT(pRuntime != NULL);
 
         pRuntime->SetReaderDocument(pDocument);
 
         IJS_Context* pContext = pRuntime->NewContext();
         ASSERT(pContext != NULL);
 
         pContext->OnBookmark_MouseUp(pBookmark);
 
         CFX_WideString csInfo;
-        FX_BOOL bRet = pContext->RunScript(swJS, csInfo);
+        FX_BOOL bRet = pContext->RunScript(swJS, &csInfo);
         if (!bRet) {
           // CBCL_FormNotify::MsgBoxJSError(pPageView->GetPageViewWnd(),
           // csInfo);
         }
 
         pRuntime->ReleaseContext(pContext);
       }
     }
   } else {
     DoAction_NoJs(action, pDocument);
@@ skipping 182 matching lines @@
       pContext->OnField_Validate(data.sChange, data.sChangeEx, data.bKeyDown,
                                  data.bModifier, data.bShift, pFormField,
                                  data.sValue, data.bRC);
       break;
     default:
       ASSERT(FALSE);
       break;
   }
 
   CFX_WideString csInfo;
-  FX_BOOL bRet = pContext->RunScript(script, csInfo);
+  FX_BOOL bRet = pContext->RunScript(script, &csInfo);
   if (!bRet) {
     // CBCL_FormNotify::MsgBoxJSError(pPageView->GetPageViewWnd(), csInfo);
   }
 
   pRuntime->ReleaseContext(pContext);
 }
 
 void CPDFSDK_ActionHandler::RunDocumentOpenJavaScript(
     CPDFSDK_Document* pDocument,
     const CFX_WideString& sScriptName,
     const CFX_WideString& script) {
   ASSERT(pDocument != NULL);
 
   IJS_Runtime* pRuntime = pDocument->GetJsRuntime();
   ASSERT(pRuntime != NULL);
 
   pRuntime->SetReaderDocument(pDocument);
 
   IJS_Context* pContext = pRuntime->NewContext();
   ASSERT(pContext != NULL);
 
   pContext->OnDoc_Open(pDocument, sScriptName);
 
   CFX_WideString csInfo;
-  FX_BOOL bRet = pContext->RunScript(script, csInfo);
+  FX_BOOL bRet = pContext->RunScript(script, &csInfo);
   if (!bRet) {
     // CBCL_FormNotify::MsgBoxJSError(pPageView->GetPageViewWnd(), csInfo);
   }
 
   pRuntime->ReleaseContext(pContext);
 }
 
 void CPDFSDK_ActionHandler::RunDocumentPageJavaScript(
     CPDFSDK_Document* pDocument,
     CPDF_AAction::AActionType type,
@@ skipping 35 matching lines @@
       break;
     case CPDF_AAction::PageInvisible:
       pContext->OnPage_OutView(pDocument);
       break;
     default:
       ASSERT(FALSE);
       break;
   }
 
   CFX_WideString csInfo;
-  FX_BOOL bRet = pContext->RunScript(script, csInfo);
+  FX_BOOL bRet = pContext->RunScript(script, &csInfo);
   if (!bRet) {
     // CBCL_FormNotify::MsgBoxJSError(pPageView->GetPageViewWnd(), csInfo);
   }
 
   pRuntime->ReleaseContext(pContext);
 }
 
 FX_BOOL CPDFSDK_FormActionHandler::DoAction_Hide(const CPDF_Action& action,
                                                  CPDFSDK_Document* pDocument) {
   ASSERT(pDocument != NULL);
@@ skipping 43 matching lines @@
   CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pDocument->GetInterForm();
   ASSERT(pInterForm != NULL);
 
   if (pInterForm->DoAction_ImportData(action)) {
     pDocument->SetChangeMark();
     return TRUE;
   }
 
   return FALSE;
 }