From 71fdc34b71760735aa0c14c820a1a10eb1e5829a Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 22 Jan 2016 12:06:32 -0800 Subject: Merge to XFA: Change _PDF_RenderItem to CPDF_RenderContext::Layer. Original Review URL: https://codereview.chromium.org/1620523002 . (cherry picked from commit d5712ac571f3487fe3f74617fdab007a11a09052) TBR=ochang@chromium.org Review URL: https://codereview.chromium.org/1624553004 . --- core/src/fpdfdoc/doc_annot.cpp | 5 +++-- core/src/fpdfdoc/doc_formcontrol.cpp | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'core/src/fpdfdoc') diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp index 814496ff7f..5786349490 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, diff --git a/core/src/fpdfdoc/doc_formcontrol.cpp b/core/src/fpdfdoc/doc_formcontrol.cpp index bf37d85195..1ec98bb986 100644 --- a/core/src/fpdfdoc/doc_formcontrol.cpp +++ b/core/src/fpdfdoc/doc_formcontrol.cpp @@ -170,7 +170,8 @@ void CPDF_FormControl::DrawControl(CFX_RenderDevice* pDevice, 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. -- cgit v1.2.3