From d9826495fe0e279c6e2d587a656c7452cc2dc71f Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Sat, 6 Oct 2018 00:32:16 +0000 Subject: 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 Reviewed-by: Tom Sepez --- core/fpdfapi/page/cpdf_pageobject.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'core/fpdfapi/page/cpdf_pageobject.cpp') diff --git a/core/fpdfapi/page/cpdf_pageobject.cpp b/core/fpdfapi/page/cpdf_pageobject.cpp index 0c3a850936..c61a7c333d 100644 --- a/core/fpdfapi/page/cpdf_pageobject.cpp +++ b/core/fpdfapi/page/cpdf_pageobject.cpp @@ -9,11 +9,11 @@ constexpr int32_t CPDF_PageObject::kNoContentStream; CPDF_PageObject::CPDF_PageObject(int32_t content_stream) - : m_bDirty(false), m_ContentStream(content_stream) {} + : m_ContentStream(content_stream) {} CPDF_PageObject::CPDF_PageObject() : CPDF_PageObject(kNoContentStream) {} -CPDF_PageObject::~CPDF_PageObject() {} +CPDF_PageObject::~CPDF_PageObject() = default; bool CPDF_PageObject::IsText() const { return false; @@ -77,21 +77,18 @@ const CPDF_FormObject* CPDF_PageObject::AsForm() const { void CPDF_PageObject::CopyData(const CPDF_PageObject* pSrc) { CopyStates(*pSrc); - m_Left = pSrc->m_Left; - m_Right = pSrc->m_Right; - m_Top = pSrc->m_Top; - m_Bottom = pSrc->m_Bottom; + m_Rect = pSrc->m_Rect; m_bDirty = true; } -void CPDF_PageObject::TransformClipPath(CFX_Matrix& matrix) { +void CPDF_PageObject::TransformClipPath(const CFX_Matrix& matrix) { if (!m_ClipPath.HasRef()) return; m_ClipPath.Transform(matrix); SetDirty(true); } -void CPDF_PageObject::TransformGeneralState(CFX_Matrix& matrix) { +void CPDF_PageObject::TransformGeneralState(const CFX_Matrix& matrix) { if (!m_GeneralState.HasRef()) return; m_GeneralState.GetMutableMatrix()->Concat(matrix); -- cgit v1.2.3