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

core/fpdfdoc/include/cpdf_annot.h

Index: core/fpdfdoc/include/cpdf_annot.h
diff --git a/core/fpdfdoc/include/cpdf_annot.h b/core/fpdfdoc/include/cpdf_annot.h
index eb9f02a717d8191850574315000271290778e5c4..a712433fd2290a95cff722f2b8f4700a8a74e42a 100644
--- a/core/fpdfdoc/include/cpdf_annot.h
+++ b/core/fpdfdoc/include/cpdf_annot.h
@@ -71,6 +71,7 @@ class CPDF_Annot {
   static CPDF_Annot::Subtype StringToAnnotSubtype(
       const CFX_ByteString& sSubtype);
   static CFX_ByteString AnnotSubtypeToString(CPDF_Annot::Subtype nSubtype);
+  static CFX_FloatRect RectFromQuads(CPDF_Dictionary* pAnnotDict);
 
   CPDF_Annot(CPDF_Dictionary* pDict, CPDF_Document* pDocument, bool bToOwnDict);
   ~CPDF_Annot();
@@ -100,6 +101,7 @@ class CPDF_Annot {
 
  private:
   void GenerateAPIfNeeded();
+  CFX_FloatRect RectForDrawing() const;
 
   // For regular annotations, |m_pAnnotDict| is not owned. For
   // our artificially created popup annotations, |m_pAnnotDict|
@@ -111,6 +113,8 @@ class CPDF_Annot {
   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;
+  bool m_isMarkupAnnotation;

[Lei Zhang, 2016/09/06 21:27:03]

m_bIsMarkupAnnotation

   // Not owned. If there is a valid pointer in |m_pPopupAnnot|,
   // then this annot is never a popup.
   CPDF_Annot* m_pPopupAnnot;