Clean up CPDF_AnnotList.

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/fsdk_mgr.h"
 #include "../include/fsdk_baseannot.h"
@@ skipping 83 matching lines @@
   int nType = GetFieldType();
 
   if (nType == FIELDTYPE_SIGNATURE)
     return BFFT_SIGNATURE;
   return CPDFSDK_Annot::GetSubType();
 }
 
 CPDF_FormField* CPDFSDK_Widget::GetFormField() const {
   ASSERT(m_pInterForm != NULL);
 
   CPDF_FormControl* pCtrl = GetFormControl();

[Tom Sepez, 2015/10/30 20:26:07]

I thought I'd collapsed a bunch of these into:

  return GetFormControl()->GetField();

[Lei Zhang, 2015/10/30 22:17:50]

Done.

-  ASSERT(pCtrl != NULL);
-
   return pCtrl->GetField();
 }
 
 CPDF_FormControl* CPDFSDK_Widget::GetFormControl() const {
-  ASSERT(m_pInterForm != NULL);
-
   CPDF_InterForm* pPDFInterForm = m_pInterForm->GetInterForm();
-  ASSERT(pPDFInterForm != NULL);
-
   return pPDFInterForm->GetControlByDict(GetAnnotDict());
 }
 
-CPDF_FormControl* CPDFSDK_Widget::GetFormControl(CPDF_InterForm* pInterForm,
-                                                 CPDF_Dictionary* pAnnotDict) {
-  ASSERT(pInterForm != NULL);
+CPDF_FormControl* CPDFSDK_Widget::GetFormControl(
+    CPDF_InterForm* pInterForm,
+    const CPDF_Dictionary* pAnnotDict) {
   ASSERT(pAnnotDict != NULL);
-
-  CPDF_FormControl* pControl = pInterForm->GetControlByDict(pAnnotDict);
-
-  return pControl;
+  return pInterForm->GetControlByDict(pAnnotDict);
 }
 
 int CPDFSDK_Widget::GetRotate() const {
   CPDF_FormControl* pCtrl = GetFormControl();
-  ASSERT(pCtrl != NULL);
-
   return pCtrl->GetRotation() % 360;
 }
 
 FX_BOOL CPDFSDK_Widget::GetFillColor(FX_COLORREF& color) const {
   CPDF_FormControl* pFormCtrl = GetFormControl();
   ASSERT(pFormCtrl != NULL);
 
   int iColorType = 0;
   color = FX_ARGBTOCOLORREF(pFormCtrl->GetBackgroundColor(iColorType));
 
@@ skipping 2416 matching lines @@
       break;
     }
   }
 }
 
 CPDF_Rect CBA_AnnotIterator::GetAnnotRect(CPDFSDK_Annot* pAnnot) {
   CPDF_Rect rcAnnot;
   pAnnot->GetPDFAnnot()->GetRect(rcAnnot);
   return rcAnnot;
 }