Hidden annotations should not be drawn

core/fpdfdoc/cpvt_generateap.cpp

Index: core/fpdfdoc/cpvt_generateap.cpp
diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp
index f15869b13004d4021c5f15f9b30ac76a566abf83..be61f2e78816299b2824bdb2c02af1653af4850c 100644
--- a/core/fpdfdoc/cpvt_generateap.cpp
+++ b/core/fpdfdoc/cpvt_generateap.cpp
@@ -14,6 +14,7 @@
 #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h"
 #include "core/fpdfdoc/cpvt_color.h"
 #include "core/fpdfdoc/cpvt_fontmap.h"
+#include "core/fpdfdoc/include/cpdf_annot.h"
 #include "core/fpdfdoc/include/cpdf_formfield.h"
 #include "core/fpdfdoc/include/cpvt_word.h"
 
@@ -612,6 +613,10 @@ bool CPVT_GenerateAP::GenerateTextFieldAP(CPDF_Document* pDoc,
   return GenerateWidgetAP(pDoc, pAnnotDict, 0);
 }
 
+static bool IsAnnotationHidden(CPDF_Dictionary* pAnnotDict) {

[Lei Zhang, 2016/08/15 00:10:08]

Can you only implement this once? static bool
CPDF_Annot::IsAnnotationHidden(CPDF_Dictionary* pAnnotDict); ?

+  return pAnnotDict->GetIntegerBy("F") & ANNOTFLAG_HIDDEN;
+}
+
 bool CPVT_GenerateAP::GenerateCircleAP(CPDF_Document* pDoc,
                                        CPDF_Dictionary* pAnnotDict) {
   // If AP dictionary exists, we use the appearance defined in the
@@ -619,6 +624,9 @@ bool CPVT_GenerateAP::GenerateCircleAP(CPDF_Document* pDoc,
   if (pAnnotDict->KeyExist("AP"))
     return false;
 
+  if (IsAnnotationHidden(pAnnotDict))
+    return false;
+
   CFX_ByteTextBuf sAppStream;
   CFX_ByteString sExtGSDictName = "GS";
   sAppStream << "/" << sExtGSDictName << " gs ";
@@ -695,6 +703,9 @@ bool CPVT_GenerateAP::GenerateHighlightAP(CPDF_Document* pDoc,
   if (pAnnotDict->KeyExist("AP"))
     return false;
 
+  if (IsAnnotationHidden(pAnnotDict))
+    return false;
+
   CFX_ByteTextBuf sAppStream;
   CFX_ByteString sExtGSDictName = "GS";
   sAppStream << "/" << sExtGSDictName << " gs ";
@@ -725,6 +736,9 @@ bool CPVT_GenerateAP::GenerateInkAP(CPDF_Document* pDoc,
   if (pAnnotDict->KeyExist("AP"))
     return false;
 
+  if (IsAnnotationHidden(pAnnotDict))
+    return false;
+
   FX_FLOAT fBorderWidth = GetBorderWidth(*pAnnotDict);
   bool bIsStroke = fBorderWidth > 0;
 
@@ -781,6 +795,9 @@ bool CPVT_GenerateAP::GenerateUnderlineAP(CPDF_Document* pDoc,
   if (pAnnotDict->KeyExist("AP"))
     return false;
 
+  if (IsAnnotationHidden(pAnnotDict))
+    return false;
+
   CFX_ByteTextBuf sAppStream;
   CFX_ByteString sExtGSDictName = "GS";
   sAppStream << "/" << sExtGSDictName << " gs ";
@@ -810,6 +827,9 @@ bool CPVT_GenerateAP::GenerateSquareAP(CPDF_Document* pDoc,
   if (pAnnotDict->KeyExist("AP"))
     return false;
 
+  if (IsAnnotationHidden(pAnnotDict))
+    return false;
+
   CFX_ByteTextBuf sAppStream;
   CFX_ByteString sExtGSDictName = "GS";
   sAppStream << "/" << sExtGSDictName << " gs ";
@@ -860,6 +880,9 @@ bool CPVT_GenerateAP::GenerateSquigglyAP(CPDF_Document* pDoc,
   if (pAnnotDict->KeyExist("AP"))
     return false;
 
+  if (IsAnnotationHidden(pAnnotDict))
+    return false;
+
   CFX_ByteTextBuf sAppStream;
   CFX_ByteString sExtGSDictName = "GS";
   sAppStream << "/" << sExtGSDictName << " gs ";
@@ -911,6 +934,9 @@ bool CPVT_GenerateAP::GenerateStrikeOutAP(CPDF_Document* pDoc,
   if (pAnnotDict->KeyExist("AP"))
     return false;
 
+  if (IsAnnotationHidden(pAnnotDict))
+    return false;
+
   CFX_ByteTextBuf sAppStream;
   CFX_ByteString sExtGSDictName = "GS";
   sAppStream << "/" << sExtGSDictName << " gs ";