Convert IJS_Runtime to CPDFSDK_FormFillEnvironment

fpdfsdk/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 "fpdfsdk/fsdk_actionhandler.h"
 
 #include <set>
 
@@ skipping 137 matching lines @@
 
   visited->insert(pDict);
 
   CPDFSDK_FormFillEnvironment* pFormFillEnv = pDocument->GetEnv();
   ASSERT(pFormFillEnv);
   if (action.GetType() == CPDF_Action::JavaScript) {
     if (pFormFillEnv->IsJSInitiated()) {
       CFX_WideString swJS = action.GetJavaScript();
       if (!swJS.IsEmpty()) {
         IJS_Runtime* pRuntime = pFormFillEnv->GetJSRuntime();
-        pRuntime->SetReaderDocument(pDocument);

[dsinclair, 2016/10/11 17:37:45]

We got the env from the Document, then get the runtime for that env, so the env
should be the same in both cases.

-
         IJS_Context* pContext = pRuntime->NewContext();
         pContext->OnLink_MouseUp(pFormFillEnv);
 
         CFX_WideString csInfo;
         FX_BOOL bRet = pContext->RunScript(swJS, &csInfo);
         if (!bRet) {
           // FIXME: return error.
         }
 
         pRuntime->ReleaseContext(pContext);
@@ skipping 107 matching lines @@
 
   visited->insert(pDict);
 
   CPDFSDK_FormFillEnvironment* pEnv = pDocument->GetEnv();
   ASSERT(pEnv);
   if (action.GetType() == CPDF_Action::JavaScript) {
     if (pEnv->IsJSInitiated()) {
       CFX_WideString swJS = action.GetJavaScript();
       if (!swJS.IsEmpty()) {
         IJS_Runtime* pRuntime = pDocument->GetJsRuntime();
-        pRuntime->SetReaderDocument(pDocument);
-
         IJS_Context* pContext = pRuntime->NewContext();
         CFX_WideString csInfo;
         FX_BOOL bRet = pContext->RunScript(swJS, &csInfo);
         if (!bRet) {
           // FIXME: return error.
         }
 
         pRuntime->ReleaseContext(pContext);
       }
     }
@@ skipping 21 matching lines @@
 
   visited->insert(pDict);
 
   CPDFSDK_FormFillEnvironment* pEnv = pDocument->GetEnv();
   ASSERT(pEnv);
   if (action.GetType() == CPDF_Action::JavaScript) {
     if (pEnv->IsJSInitiated()) {
       CFX_WideString swJS = action.GetJavaScript();
       if (!swJS.IsEmpty()) {
         IJS_Runtime* pRuntime = pDocument->GetJsRuntime();
-        pRuntime->SetReaderDocument(pDocument);
-
         IJS_Context* pContext = pRuntime->NewContext();
         pContext->OnBookmark_MouseUp(pBookmark);
 
         CFX_WideString csInfo;
         FX_BOOL bRet = pContext->RunScript(swJS, &csInfo);
         if (!bRet) {
           // FIXME: return error.
         }
 
         pRuntime->ReleaseContext(pContext);
@@ skipping 129 matching lines @@
 
 void CPDFSDK_ActionHandler::RunFieldJavaScript(CPDFSDK_Document* pDocument,
                                                CPDF_FormField* pFormField,
                                                CPDF_AAction::AActionType type,
                                                PDFSDK_FieldAction& data,
                                                const CFX_WideString& script) {
   ASSERT(type != CPDF_AAction::Calculate);
   ASSERT(type != CPDF_AAction::Format);
 
   IJS_Runtime* pRuntime = pDocument->GetJsRuntime();
-  pRuntime->SetReaderDocument(pDocument);
-
   IJS_Context* pContext = pRuntime->NewContext();
   switch (type) {
     case CPDF_AAction::CursorEnter:
       pContext->OnField_MouseEnter(data.bModifier, data.bShift, pFormField);
       break;
     case CPDF_AAction::CursorExit:
       pContext->OnField_MouseExit(data.bModifier, data.bShift, pFormField);
       break;
     case CPDF_AAction::ButtonDown:
       pContext->OnField_MouseDown(data.bModifier, data.bShift, pFormField);
@@ skipping 32 matching lines @@
   }
 
   pRuntime->ReleaseContext(pContext);
 }
 
 void CPDFSDK_ActionHandler::RunDocumentOpenJavaScript(
     CPDFSDK_Document* pDocument,
     const CFX_WideString& sScriptName,
     const CFX_WideString& script) {
   IJS_Runtime* pRuntime = pDocument->GetJsRuntime();
-  pRuntime->SetReaderDocument(pDocument);
   IJS_Context* pContext = pRuntime->NewContext();
   pContext->OnDoc_Open(pDocument->GetEnv(), sScriptName);
 
   CFX_WideString csInfo;
   FX_BOOL bRet = pContext->RunScript(script, &csInfo);
   if (!bRet) {
     // FIXME: return error.
   }
 
   pRuntime->ReleaseContext(pContext);
 }
 
 void CPDFSDK_ActionHandler::RunDocumentPageJavaScript(
     CPDFSDK_Document* pDocument,
     CPDF_AAction::AActionType type,
     const CFX_WideString& script) {
   IJS_Runtime* pRuntime = pDocument->GetJsRuntime();
-  pRuntime->SetReaderDocument(pDocument);
-
   IJS_Context* pContext = pRuntime->NewContext();
   switch (type) {
     case CPDF_AAction::OpenPage:
       pContext->OnPage_Open(pDocument->GetEnv());
       break;
     case CPDF_AAction::ClosePage:
       pContext->OnPage_Close(pDocument->GetEnv());
       break;
     case CPDF_AAction::CloseDocument:
       pContext->OnDoc_WillClose(pDocument->GetEnv());
@@ skipping 58 matching lines @@
     const CPDF_Action& action,
     CPDFSDK_Document* pDocument) {
   CPDFSDK_InterForm* pInterForm = pDocument->GetInterForm();
   if (pInterForm->DoAction_ImportData(action)) {
     pDocument->SetChangeMark();
     return TRUE;
   }
 
   return FALSE;
 }