From cf53b788ca1c097c0cbbca3dee048520eb9dabd4 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Thu, 4 May 2017 14:08:01 -0400 Subject: Cleanup CXFA_RenderContext Move StartRender into the constructor, remove StopRender as it will be handled by the destructor. Remove RenderOptions as they are always set the same way. Change-Id: Iddbd6849199cbe255a5e1694164de5556a34f57c Reviewed-on: https://pdfium-review.googlesource.com/4876 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- fpdfsdk/cpdfsdk_pageview.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'fpdfsdk/cpdfsdk_pageview.cpp') diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp index 946dd84163..2dd8e309cf 100644 --- a/fpdfsdk/cpdfsdk_pageview.cpp +++ b/fpdfsdk/cpdfsdk_pageview.cpp @@ -95,18 +95,17 @@ void CPDFSDK_PageView::PageView_OnDraw(CFX_RenderDevice* pDevice, return; if (pPage->GetContext()->GetDocType() == XFA_DocType::Dynamic) { - CFX_Graphics gs(pDevice); CFX_RectF rectClip( static_cast(pClip.left), static_cast(pClip.top), static_cast(pClip.Width()), static_cast(pClip.Height())); + + CFX_Graphics gs(pDevice); gs.SetClipRect(rectClip); - auto pRenderContext = pdfium::MakeUnique(); - CXFA_RenderOptions renderOptions; - renderOptions.m_bHighlight = true; + CXFA_FFPageView* xfaView = pPage->GetXFAPageView(); - pRenderContext->StartRender(xfaView, &gs, *pUser2Device, renderOptions); - pRenderContext->DoRender(); - pRenderContext->StopRender(); + CXFA_RenderContext renderContext(xfaView, rectClip, *pUser2Device); + renderContext.DoRender(&gs); + CXFA_FFDocView* docView = xfaView->GetDocView(); if (!docView) return; -- cgit v1.2.3