Next round of XFA changes to match master

fpdfsdk/src/fsdk_baseform.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 "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_util.h"
@@ skipping 943 matching lines @@
   ASSERT(m_pInterForm != NULL);
   m_pInterForm->UpdateField(pFormField);
 }
 
 void CPDFSDK_Widget::DrawShadow(CFX_RenderDevice* pDevice,
                                 CPDFSDK_PageView* pPageView) {
   ASSERT(m_pInterForm != NULL);
 
   int nFieldType = GetFieldType();
   if (m_pInterForm->IsNeedHighLight(nFieldType)) {
-    //          if (nFieldType != FIELDTYPE_PUSHBUTTON)
-    //          {
     CPDF_Rect rc = GetRect();
     FX_COLORREF color = m_pInterForm->GetHighlightColor(nFieldType);
     uint8_t alpha = m_pInterForm->GetHighlightAlpha();
 
     CFX_FloatRect rcDevice;
     ASSERT(m_pInterForm->GetDocument());
     CPDFDoc_Environment* pEnv = m_pInterForm->GetDocument()->GetEnv();
     if (!pEnv)
       return;
     CFX_AffineMatrix page2device;
     pPageView->GetCurrentMatrix(page2device);
     page2device.Transform(((FX_FLOAT)rc.left), ((FX_FLOAT)rc.bottom),
                           rcDevice.left, rcDevice.bottom);
-    //          pEnv->FFI_PageToDevice(m_pPageView->GetPDFPage(), rc.left,
-    //          rc.bottom, &rcDevice.left, &rcDevice.bottom);
-    //          pEnv->FFI_PageToDevice(m_pPageView->GetPDFPage(), rc.right,
-    //          rc.top, &rcDevice.right, &rcDevice.top);
     page2device.Transform(((FX_FLOAT)rc.right), ((FX_FLOAT)rc.top),
                           rcDevice.right, rcDevice.top);
 
     rcDevice.Normalize();
 
     FX_ARGB argb = ArgbEncode((int)alpha, color);
     FX_RECT rcDev((int)rcDevice.left, (int)rcDevice.top, (int)rcDevice.right,
                   (int)rcDevice.bottom);
     pDevice->FillRect(&rcDev, argb);
-    /*      }*/
   }
 }
 
 void CPDFSDK_Widget::ResetAppearance_PushButton() {
   CPDF_FormControl* pControl = GetFormControl();
   ASSERT(pControl != NULL);
 
   CPDF_Rect rcWindow = GetRotatedRect();
 
   int32_t nLayout = 0;
@@ skipping 1206 matching lines @@
   m_pInterForm->SetFormNotify(this);
 
   for (int i = 0; i < 6; i++)
     m_bNeedHightlight[i] = FALSE;
   m_iHighlightAlpha = 0;
 }
 
 CPDFSDK_InterForm::~CPDFSDK_InterForm() {
   delete m_pInterForm;
   m_pInterForm = nullptr;
-
   m_Map.clear();
   m_XFAMap.RemoveAll();
 }
 
 FX_BOOL CPDFSDK_InterForm::HighlightWidgets() {
   return FALSE;
 }
 
 CPDFSDK_Widget* CPDFSDK_InterForm::GetSibling(CPDFSDK_Widget* pWidget,
                                               FX_BOOL bNext) const {
@@ skipping 744 matching lines @@
     if (bRC) {
       OnValidate(pFormField, csValue, bRC);
       return bRC ? 1 : -1;
     }
     return -1;
   }
   return 0;
 }
 
 int CPDFSDK_InterForm::AfterValueChange(const CPDF_FormField* pField) {
-  ASSERT(pField != NULL);
-
   CPDF_FormField* pFormField = (CPDF_FormField*)pField;
-
   SynchronizeField(pFormField, FALSE);
 
   int nType = pFormField->GetFieldType();
-
   if (nType == FIELDTYPE_COMBOBOX || nType == FIELDTYPE_TEXTFIELD) {
     OnCalculate(pFormField);
     FX_BOOL bFormated = FALSE;
     CFX_WideString sValue = OnFormat(pFormField, bFormated);
     if (bFormated)
       ResetFieldAppearance(pFormField, sValue.c_str(), TRUE);
     else
       ResetFieldAppearance(pFormField, NULL, TRUE);
     UpdateField(pFormField);
   }
-
   return 0;
 }
 
 int CPDFSDK_InterForm::BeforeSelectionChange(const CPDF_FormField* pField,
                                              CFX_WideString& csValue) {
   CPDF_FormField* pFormField = (CPDF_FormField*)pField;
   if (pFormField->GetFieldType() != FIELDTYPE_LISTBOX)
     return 0;
 
   FX_BOOL bRC = TRUE;
@@ skipping 355 matching lines @@
   ASSERT(pAnnot != NULL);
 
   CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
   ASSERT(pPDFAnnot != NULL);
 
   CPDF_Rect rcAnnot;
   pPDFAnnot->GetRect(rcAnnot);
 
   return rcAnnot;
 }