From f0e2e1b09cf1ce0e537888a99f04be6f10edcada Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 2 Nov 2015 13:27:54 -0800 Subject: XFA: Simplify CPDFSDK_PageView::PageView_OnDraw(). The clip parameter is never NULL. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1417983006 . --- fpdfsdk/src/fsdk_mgr.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'fpdfsdk/src/fsdk_mgr.cpp') diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index f12e8fb595..1b09714dfa 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -654,7 +654,7 @@ CPDFSDK_PageView::~CPDFSDK_PageView() { void CPDFSDK_PageView::PageView_OnDraw(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device, CPDF_RenderOptions* pOptions, - FX_RECT* pClip) { + const FX_RECT& pClip) { m_curMatrix = *pUser2Device; CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); CPDFXFA_Page* pPage = GetPDFXFAPage(); @@ -666,14 +666,12 @@ void CPDFSDK_PageView::PageView_OnDraw(CFX_RenderDevice* pDevice, if (pPage->GetDocument()->GetDocType() == DOCTYPE_DYNIMIC_XFA) { CFX_Graphics gs; gs.Create(pDevice); - if (pClip) { - CFX_RectF rectClip; - rectClip.Set(static_cast(pClip->left), - static_cast(pClip->top), - static_cast(pClip->Width()), - static_cast(pClip->Height())); - gs.SetClipRect(rectClip); - } + CFX_RectF rectClip; + rectClip.Set(static_cast(pClip.left), + static_cast(pClip.top), + static_cast(pClip.Width()), + static_cast(pClip.Height())); + gs.SetClipRect(rectClip); IXFA_RenderContext* pRenderContext = XFA_RenderContext_Create(); if (!pRenderContext) return; -- cgit v1.2.3