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/fpdfapi/fpdf_render/fpdf_render_pattern.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp') diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp index 8cee178369..c1bb6f6813 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp @@ -989,8 +989,8 @@ static CFX_DIBitmap* DrawPatternBitmap(CPDF_Document* pDoc, flags |= RENDER_FORCE_HALFTONE; options.m_Flags = flags; CPDF_RenderContext context(pDoc, pCache); - context.DrawObjectList(&bitmap_device, pPattern->m_pForm, &mtPattern2Bitmap, - &options); + context.AppendLayer(pPattern->m_pForm, &mtPattern2Bitmap); + context.Render(&bitmap_device, &options, nullptr); return pBitmap; } void CPDF_RenderStatus::DrawTilingPattern(CPDF_TilingPattern* pPattern, @@ -1111,13 +1111,13 @@ void CPDF_RenderStatus::DrawTilingPattern(CPDF_TilingPattern* pPattern, CFX_DIBitmap* pPatternBitmap = NULL; if (width * height < 16) { CFX_DIBitmap* pEnlargedBitmap = - DrawPatternBitmap(m_pContext->m_pDocument, m_pContext->m_pPageCache, + DrawPatternBitmap(m_pContext->GetDocument(), m_pContext->GetPageCache(), pPattern, pObj2Device, 8, 8, m_Options.m_Flags); pPatternBitmap = pEnlargedBitmap->StretchTo(width, height); delete pEnlargedBitmap; } else { pPatternBitmap = DrawPatternBitmap( - m_pContext->m_pDocument, m_pContext->m_pPageCache, pPattern, + m_pContext->GetDocument(), m_pContext->GetPageCache(), pPattern, pObj2Device, width, height, m_Options.m_Flags); } if (!pPatternBitmap) { -- cgit v1.2.3