Merge to XFA: Change _PDF_RenderItem to CPDF_RenderContext::Layer.

core/src/fpdfdoc/doc_annot.cpp

Index: core/src/fpdfdoc/doc_annot.cpp
diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp
index 814496ff7f33e0d3e47032b9f89c7b2f059f9b70..578634949078fa14fc04cecfb1ba6175afc55a51 100644
--- a/core/src/fpdfdoc/doc_annot.cpp
+++ b/core/src/fpdfdoc/doc_annot.cpp
@@ -227,7 +227,8 @@ FX_BOOL CPDF_Annot::DrawAppearance(CPDF_Page* pPage,
     return FALSE;
   }
   CPDF_RenderContext context(pPage);
-  context.DrawObjectList(pDevice, pForm, &matrix, pOptions);
+  context.AppendLayer(pForm, &matrix);
+  context.Render(pDevice, pOptions, nullptr);
   return TRUE;
 }
 FX_BOOL CPDF_Annot::DrawInContext(const CPDF_Page* pPage,
@@ -240,7 +241,7 @@ FX_BOOL CPDF_Annot::DrawInContext(const CPDF_Page* pPage,
   if (!pForm) {
     return FALSE;
   }
-  pContext->AppendObjectList(pForm, &matrix);
+  pContext->AppendLayer(pForm, &matrix);
   return TRUE;
 }
 void CPDF_Annot::DrawBorder(CFX_RenderDevice* pDevice,