Convert IJS_Runtime to CPDFSDK_FormFillEnvironment

fpdfsdk/cpdfsdk_interform.cpp

 // Copyright 2016 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/cpdfsdk_interform.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 218 matching lines @@
     return;
 
   m_bBusy = TRUE;
 
   if (!IsCalculateEnabled()) {
     m_bBusy = FALSE;
     return;
   }
 
   IJS_Runtime* pRuntime = m_pFormFillEnv->GetJSRuntime();
-  pRuntime->SetReaderDocument(m_pFormFillEnv->GetSDKDocument());

[Tom Sepez, 2016/10/11 16:17:13]

Remind me again why we think documents are 1:1 with IJS_Runtimes.

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

The GetJSRuntime method, if it doesn't already exist, creates the JSRuntime and
passes |this| as the environment for the runtime. The |CPDFSDK_Document| is only
created in the env, so they have to be 1:1. So, getting the sdk document out of
the environment and putting it into the |SetReaderDocument| should be the same
as just getting it from the environment.

Does that make sense? (It's possible I'm off base here ....)

-
   int nSize = m_pInterForm->CountFieldsInCalculationOrder();
   for (int i = 0; i < nSize; i++) {
     CPDF_FormField* pField = m_pInterForm->GetFieldInCalculationOrder(i);
     if (!pField)
       continue;
 
     int nType = pField->GetFieldType();
     if (nType != FIELDTYPE_COMBOBOX && nType != FIELDTYPE_TEXTFIELD)
       continue;
 
@@ skipping 28 matching lines @@
 
 CFX_WideString CPDFSDK_InterForm::OnFormat(CPDF_FormField* pFormField,
                                            FX_BOOL& bFormatted) {
   CFX_WideString sValue = pFormField->GetValue();
   if (!m_pFormFillEnv->IsJSInitiated()) {
     bFormatted = FALSE;
     return sValue;
   }
 
   IJS_Runtime* pRuntime = m_pFormFillEnv->GetJSRuntime();
-  pRuntime->SetReaderDocument(m_pFormFillEnv->GetSDKDocument());

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

Same reasoning as above.

-
   if (pFormField->GetFieldType() == FIELDTYPE_COMBOBOX &&
       pFormField->CountSelectedItems() > 0) {
     int index = pFormField->GetSelectedIndex(0);
     if (index >= 0)
       sValue = pFormField->GetOptionLabel(index);
   }
 
   bFormatted = FALSE;
 
   CPDF_AAction aAction = pFormField->GetAdditionalAction();
@@ skipping 415 matching lines @@
   }
 }
 
 FX_COLORREF CPDFSDK_InterForm::GetHighlightColor(int nFieldType) {
   if (nFieldType < 0 || nFieldType > kNumFieldTypes)
     return FXSYS_RGB(255, 255, 255);
   if (nFieldType == 0)
     return m_aHighlightColor[0];
   return m_aHighlightColor[nFieldType - 1];
 }