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

core/src/fpdfdoc/doc_formcontrol.cpp

 // Copyright 2014 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
 
 #include <algorithm>
 
 #include "core/include/fpdfdoc/fpdf_doc.h"
 
@@ skipping 152 matching lines @@
   CFX_Matrix form_matrix = pStream->GetDict()->GetMatrix("Matrix");
   form_matrix.TransformRect(form_bbox);
   CFX_FloatRect arect = m_pWidgetDict->GetRect("Rect");
   CFX_Matrix matrix;
   matrix.MatchRect(arect, form_bbox);
   matrix.Concat(*pMatrix);
   CPDF_Form form(m_pField->m_pForm->m_pDocument,
                  m_pField->m_pForm->m_pFormDict->GetDict("DR"), pStream);
   form.ParseContent(NULL, NULL, NULL, NULL);
   CPDF_RenderContext context(pPage);
-  context.DrawObjectList(pDevice, &form, &matrix, pOptions);
+  context.AppendLayer(&form, &matrix);
+  context.Render(pDevice, pOptions, nullptr);
 }
 static const FX_CHAR* const g_sHighlightingMode[] = {
     // Must match order of HiglightingMode enum.
     "N", "I", "O", "P", "T", nullptr};
 CPDF_FormControl::HighlightingMode CPDF_FormControl::GetHighlightingMode() {
   if (!m_pWidgetDict) {
     return Invert;
   }
   CFX_ByteString csH = m_pWidgetDict->GetString("H", "I");
   for (int i = 0; g_sHighlightingMode[i]; ++i) {
@@ skipping 232 matching lines @@
   return m_pDict ? m_pDict->GetStream(csEntry) : nullptr;
 }
 
 CPDF_IconFit CPDF_ApSettings::GetIconFit() const {
   return m_pDict ? m_pDict->GetDict("IF") : nullptr;
 }
 
 int CPDF_ApSettings::GetTextPosition() const {
   return m_pDict ? m_pDict->GetInteger("TP", TEXTPOS_CAPTION) : TEXTPOS_CAPTION;
 }