commit 89bf9ce294d83669922443dd17391e8c38e720a8
author Henrique Nakashima <hnakashima@chromium.org> Tue Sep 19 16:45:10 2017 -0400
committer Chromium commit bot <commit-bot@chromium.org> Tue Sep 19 20:57:21 2017 +0000
tree be25cbf3163ba80ce36347600b5093014d293a6b
parent e9d6834588b77d8cd5d14fc81309276ddcc1c3ec

Fix draw order of popup annotations.

Bug: chromium:765375
Change-Id: Ifdbd33ca92ec7105778788f891095eaf280c18cf
Reviewed-on: https://pdfium-review.googlesource.com/14370
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>

fpdfsdk/cpdfsdk_baannot.cpp

diff --git a/fpdfsdk/cpdfsdk_baannot.cpp b/fpdfsdk/cpdfsdk_baannot.cpp
index 711d228..c551fee 100644
--- a/fpdfsdk/cpdfsdk_baannot.cpp
+++ b/fpdfsdk/cpdfsdk_baannot.cpp
@@ -353,3 +353,10 @@
   if (CPDF_Annot* pAnnot = m_pAnnot->GetPopupAnnot())
     pAnnot->SetOpenState(bOpenState);
 }
+
+int CPDFSDK_BAAnnot::GetLayoutOrder() const {
+  if (m_pAnnot->GetSubtype() == CPDF_Annot::Subtype::POPUP)
+    return 1;
+
+  return CPDFSDK_Annot::GetLayoutOrder();
+}

fpdfsdk/cpdfsdk_baannot.h

diff --git a/fpdfsdk/cpdfsdk_baannot.h b/fpdfsdk/cpdfsdk_baannot.h
index 1d71585..c7300c4 100644
--- a/fpdfsdk/cpdfsdk_baannot.h
+++ b/fpdfsdk/cpdfsdk_baannot.h
@@ -92,6 +92,8 @@
 
   void SetOpenState(bool bState);
 
+  int GetLayoutOrder() const override;
+
  protected:
   CFX_UnownedPtr<CPDF_Annot> const m_pAnnot;
 };