diff options
author | Tom Sepez <tsepez@chromium.org> | 2018-08-15 19:02:38 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-15 19:02:38 +0000 |
commit | b6e3d231ef2c28df1e5149cb16ad7046ebb0714e (patch) | |
tree | df242fdcd352fd4239be92cad2cf5f4cefdc08fd /core/fpdfapi/render/cpdf_progressiverenderer.cpp | |
parent | 48ae3075a5c80e75923a60d4d0ba0b56d9b08c2a (diff) | |
download | pdfium-b6e3d231ef2c28df1e5149cb16ad7046ebb0714e.tar.xz |
Make CPDF_RenderStatus::Initialize() saner.
Move mandatory arguments to ctor.
Replace long list of positional parameters with setter methods.
Make Initialize() return void since it can't fail.
Change-Id: I490118923855158891cf45eecd5de1e922a3a1fe
Reviewed-on: https://pdfium-review.googlesource.com/40170
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/render/cpdf_progressiverenderer.cpp')
-rw-r--r-- | core/fpdfapi/render/cpdf_progressiverenderer.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/core/fpdfapi/render/cpdf_progressiverenderer.cpp b/core/fpdfapi/render/cpdf_progressiverenderer.cpp index de140d8a22..15b58fbefe 100644 --- a/core/fpdfapi/render/cpdf_progressiverenderer.cpp +++ b/core/fpdfapi/render/cpdf_progressiverenderer.cpp @@ -54,11 +54,13 @@ void CPDF_ProgressiveRenderer::Continue(PauseIndicatorIface* pPause) { m_pCurrentLayer = m_pContext->GetLayer(m_LayerIndex); m_LastObjectRendered = m_pCurrentLayer->m_pObjectHolder->GetPageObjectList()->end(); - m_pRenderStatus = pdfium::MakeUnique<CPDF_RenderStatus>(); - m_pRenderStatus->Initialize( - m_pContext.Get(), m_pDevice.Get(), nullptr, nullptr, nullptr, nullptr, - m_pOptions, m_pCurrentLayer->m_pObjectHolder->GetTransparency(), - false, nullptr); + m_pRenderStatus = pdfium::MakeUnique<CPDF_RenderStatus>(m_pContext.Get(), + m_pDevice.Get()); + if (m_pOptions) + m_pRenderStatus->SetOptions(*m_pOptions); + m_pRenderStatus->SetTransparency( + m_pCurrentLayer->m_pObjectHolder->GetTransparency()); + m_pRenderStatus->Initialize(nullptr, nullptr); m_pDevice->SaveState(); m_ClipRect = m_pCurrentLayer->m_Matrix.GetInverse().TransformRect( CFX_FloatRect(m_pDevice->GetClipBox())); @@ -94,10 +96,10 @@ void CPDF_ProgressiveRenderer::Continue(PauseIndicatorIface* pPause) { pCurObj, &m_pCurrentLayer->m_Matrix, pPause)) { return; } - if (pCurObj->IsImage() && m_pRenderStatus->GetRenderOptions()->HasFlag( + if (pCurObj->IsImage() && m_pRenderStatus->GetRenderOptions().HasFlag( RENDER_LIMITEDIMAGECACHE)) { m_pContext->GetPageCache()->CacheOptimization( - m_pRenderStatus->GetRenderOptions()->GetCacheSizeLimit()); + m_pRenderStatus->GetRenderOptions().GetCacheSizeLimit()); } if (pCurObj->IsForm() || pCurObj->IsShading()) nObjsToGo = 0; |