diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-10-06 00:32:16 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-10-06 00:32:16 +0000 |
| commit | d9826495fe0e279c6e2d587a656c7452cc2dc71f (patch) | |
| tree | 0256f8903da70445c5f8e21b62c01d2d70385201 /core/fpdfapi/render | |
| parent | a0032a2a2c53794bbf0ccb412a5c70ce66f052fb (diff) | |
| download | pdfium-d9826495fe0e279c6e2d587a656c7452cc2dc71f.tar.xz | |
Encapsulate CPDF_PageObject's rect member.
At the same time, change it from 4 floats to a CFX_FloatRect.
Change-Id: I00ded941723d6a264b7a17c73fd337e66b449308
Reviewed-on: https://pdfium-review.googlesource.com/c/43570
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fpdfapi/render')
| -rw-r--r-- | core/fpdfapi/render/cpdf_progressiverenderer.cpp | 8 | ||||
| -rw-r--r-- | core/fpdfapi/render/cpdf_renderstatus.cpp | 17 |
2 files changed, 11 insertions, 14 deletions
diff --git a/core/fpdfapi/render/cpdf_progressiverenderer.cpp b/core/fpdfapi/render/cpdf_progressiverenderer.cpp index 1a38740a42..74b26137d1 100644 --- a/core/fpdfapi/render/cpdf_progressiverenderer.cpp +++ b/core/fpdfapi/render/cpdf_progressiverenderer.cpp @@ -78,10 +78,10 @@ void CPDF_ProgressiveRenderer::Continue(PauseIndicatorIface* pPause) { bool is_mask = false; while (iter != iterEnd) { CPDF_PageObject* pCurObj = iter->get(); - if (pCurObj && pCurObj->m_Left <= m_ClipRect.right && - pCurObj->m_Right >= m_ClipRect.left && - pCurObj->m_Bottom <= m_ClipRect.top && - pCurObj->m_Top >= m_ClipRect.bottom) { + if (pCurObj && pCurObj->GetRect().left <= m_ClipRect.right && + pCurObj->GetRect().right >= m_ClipRect.left && + pCurObj->GetRect().bottom <= m_ClipRect.top && + pCurObj->GetRect().top >= m_ClipRect.bottom) { if (m_pOptions->HasFlag(RENDER_BREAKFORMASKS) && pCurObj->IsImage() && pCurObj->AsImage()->GetImage()->IsMask()) { if (m_pDevice->GetDeviceCaps(FXDC_DEVICE_CLASS) == FXDC_PRINTER) { diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp index 19fea76d70..f77b6c654f 100644 --- a/core/fpdfapi/render/cpdf_renderstatus.cpp +++ b/core/fpdfapi/render/cpdf_renderstatus.cpp @@ -1040,10 +1040,10 @@ void CPDF_RenderStatus::RenderObjectList( if (!pCurObj) continue; - if (pCurObj->m_Left > clip_rect.right || - pCurObj->m_Right < clip_rect.left || - pCurObj->m_Bottom > clip_rect.top || - pCurObj->m_Top < clip_rect.bottom) { + if (pCurObj->GetRect().left > clip_rect.right || + pCurObj->GetRect().right < clip_rect.left || + pCurObj->GetRect().bottom > clip_rect.top || + pCurObj->GetRect().top < clip_rect.bottom) { continue; } RenderSingleObject(pCurObj.get(), mtObj2Device); @@ -1972,12 +1972,9 @@ void CPDF_RenderStatus::DrawTextPathWithPattern(const CPDF_TextObject* textobj, path.m_ClipPath.AppendTexts(&pCopy); path.m_ColorState = textobj->m_ColorState; path.m_GeneralState = textobj->m_GeneralState; - path.m_Path.AppendRect(textobj->m_Left, textobj->m_Bottom, textobj->m_Right, - textobj->m_Top); - path.m_Left = textobj->m_Left; - path.m_Bottom = textobj->m_Bottom; - path.m_Right = textobj->m_Right; - path.m_Top = textobj->m_Top; + path.m_Path.AppendRect(textobj->GetRect().left, textobj->GetRect().bottom, + textobj->GetRect().right, textobj->GetRect().top); + path.SetRect(textobj->GetRect()); AutoRestorer<UnownedPtr<const CPDF_PageObject>> restorer2(&m_pCurObj); RenderSingleObject(&path, mtObj2Device); |