Use /RECT or /QuadPoints for annotation coordinates, depending on /AP

core/fpdfdoc/include/cpdf_annot.h

 // 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
 
 #ifndef CORE_FPDFDOC_INCLUDE_CPDF_ANNOT_H_
 #define CORE_FPDFDOC_INCLUDE_CPDF_ANNOT_H_
 
 #include <map>
 #include <memory>
 
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
+#include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"

[Lei Zhang, 2016/09/01 21:13:00]

Just forward declare.

If you were keeping it, I would have asked for alphabetical order.

[tonikitoo, 2016/09/01 21:50:42]

Done.

 
 class CFX_RenderDevice;
 class CPDF_Dictionary;
 class CPDF_Document;
 class CPDF_Form;
 class CPDF_Page;
 class CPDF_RenderContext;
 class CPDF_RenderOptions;
 class CPDF_Stream;
 
@@ skipping 67 matching lines @@
   void DrawBorder(CFX_RenderDevice* pDevice,
                   const CFX_Matrix* pUser2Device,
                   const CPDF_RenderOptions* pOptions);
   CPDF_Form* GetAPForm(const CPDF_Page* pPage, AppearanceMode mode);
   void SetOpenState(bool bOpenState) { m_bOpenState = bOpenState; }
   CPDF_Annot* GetPopupAnnot() const { return m_pPopupAnnot; }
   void SetPopupAnnot(CPDF_Annot* pAnnot) { m_pPopupAnnot = pAnnot; }
 
  private:
   void GenerateAPIfNeeded();
+  bool ShouldUseQuadPointsCoords(CPDF_Array*&) const;

[Lei Zhang, 2016/09/01 21:13:00]

Please try not do add more parameters that pass by non-const ref. Also name the
parameter.

[tonikitoo, 2016/09/01 21:50:41]

Done.

 
   CPDF_Dictionary* const m_pAnnotDict;
   CPDF_Document* const m_pDocument;
   CPDF_Annot::Subtype m_nSubtype;
   std::map<CPDF_Stream*, std::unique_ptr<CPDF_Form>> m_APMap;
   // |m_bOpenState| is only set for popup annotations.
   bool m_bOpenState;
+  bool m_bHasGeneratedAP;
   // Not owned. If there is a valid pointer in |m_pPopupAnnot|,
   // then this annot is never a popup.
   CPDF_Annot* m_pPopupAnnot;
 };
 
 CPDF_Stream* FPDFDOC_GetAnnotAP(CPDF_Dictionary* pAnnotDict,
                                 CPDF_Annot::AppearanceMode mode);
 
 #endif  // CORE_FPDFDOC_INCLUDE_CPDF_ANNOT_H_