Merge to XFA: 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/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fsdk_actionhandler.h"
@@ skipping 131 matching lines @@
     return FALSE;
 
   list.AddTail(pDict);
 
   CPDFDoc_Environment* 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();  //????
-        ASSERT(pRuntime != NULL);
-
+        IJS_Runtime* pRuntime = pDocument->GetJsRuntime();
         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 112 matching lines @@
 
   list.AddTail(pDict);
 
   CPDFDoc_Environment* 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();
-        ASSERT(pRuntime != NULL);
-
         pRuntime->SetReaderDocument(pDocument);
 
         IJS_Context* pContext = pRuntime->NewContext();
-        ASSERT(pContext != NULL);
-
-        //                      switch (type)
-        //                      {
-        //                      case CPDF_AAction::CursorEnter:
-        //                              pContext->OnScreen_MouseEnter(IsCTRLpressed(),
-        // IsSHIFTpressed(), pScreen);
-        //                              break;
-        //                      case CPDF_AAction::CursorExit:
-        //                              pContext->OnScreen_MouseExit(IsCTRLpressed(),
-        // IsSHIFTpressed(), pScreen);
-        //                              break;
-        //                      case CPDF_AAction::ButtonDown:
-        //                              pContext->OnScreen_MouseDown(IsCTRLpressed(),
-        // IsSHIFTpressed(), pScreen);
-        //                              break;
-        //                      case CPDF_AAction::ButtonUp:
-        //                              pContext->OnScreen_MouseUp(IsCTRLpressed(),
-        // IsSHIFTpressed(), pScreen);
-        //                              break;
-        //                      case CPDF_AAction::GetFocus:
-        //                              pContext->OnScreen_Focus(IsCTRLpressed(),
-        // IsSHIFTpressed(), pScreen);
-        //                              break;
-        //                      case CPDF_AAction::LoseFocus:
-        //                              pContext->OnScreen_Blur(IsCTRLpressed(),
-        // IsSHIFTpressed(), pScreen);
-        //                              break;
-        //                      case CPDF_AAction::PageOpen:
-        //                              pContext->OnScreen_Open(IsCTRLpressed(),
-        // IsSHIFTpressed(), pScreen);
-        //                              break;
-        //                      case CPDF_AAction::PageClose:
-        //                              pContext->OnScreen_Close(IsCTRLpressed(),
-        // IsSHIFTpressed(), pScreen);
-        //                              break;
-        //                      case CPDF_AAction::PageVisible:
-        //                              pContext->OnScreen_InView(IsCTRLpressed(),
-        // IsSHIFTpressed(), pScreen);
-        //                              break;
-        //                      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(),
-          // csInfo);
+          // FIXME: return error.
         }
 
         pRuntime->ReleaseContext(pContext);
       }
     }
   } else {
     DoAction_NoJs(action, pDocument);
   }
 
   for (int32_t i = 0, sz = action.GetSubActionsCount(); i < sz; i++) {
@@ skipping 17 matching lines @@
 
   list.AddTail(pDict);
 
   CPDFDoc_Environment* 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();
-        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);
+          // FIXME: return error.
         }
 
         pRuntime->ReleaseContext(pContext);
       }
     }
   } else {
     DoAction_NoJs(action, pDocument);
   }
 
   for (int32_t i = 0, sz = action.GetSubActionsCount(); i < sz; i++) {
@@ skipping 179 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);
+    // FIXME: return error.
   }
 
   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);
+    // FIXME: return error.
   }
 
   pRuntime->ReleaseContext(pContext);
 }
 
 void CPDFSDK_ActionHandler::RunDocumentPageJavaScript(
     CPDFSDK_Document* pDocument,
     CPDF_AAction::AActionType type,
     const CFX_WideString& script) {
   ASSERT(pDocument != NULL);
@@ skipping 33 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);
+    // FIXME: return error.
   }
 
   pRuntime->ReleaseContext(pContext);
 }
 
 FX_BOOL CPDFSDK_FormActionHandler::DoAction_Hide(const CPDF_Action& action,
                                                  CPDFSDK_Document* pDocument) {
   ASSERT(pDocument != NULL);
 
   CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pDocument->GetInterForm();
@@ skipping 41 matching lines @@
   CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pDocument->GetInterForm();
   ASSERT(pInterForm != NULL);
 
   if (pInterForm->DoAction_ImportData(action)) {
     pDocument->SetChangeMark();
     return TRUE;
   }
 
   return FALSE;
 }