From bba2a7cf30da9e84bcc14ef32dbb0bb944229219 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Tue, 7 Feb 2017 16:36:39 -0500 Subject: Update to use CFX_Rect{F} and CFX_Matrix constructors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This Cl updates the code to use the constructors instead of creating an empty object and calling Set(). It also removes the various memsets of the CFX_Rect{F} classes. Change-Id: I6e20cec00866a38372858dcba5a30d31103172e4 Reviewed-on: https://pdfium-review.googlesource.com/2550 Commit-Queue: dsinclair Reviewed-by: Nicolás Peña Reviewed-by: Tom Sepez --- xfa/fxfa/parser/cxfa_layoutitem.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'xfa/fxfa/parser/cxfa_layoutitem.cpp') diff --git a/xfa/fxfa/parser/cxfa_layoutitem.cpp b/xfa/fxfa/parser/cxfa_layoutitem.cpp index 7a373e1e9a..476d6118ac 100644 --- a/xfa/fxfa/parser/cxfa_layoutitem.cpp +++ b/xfa/fxfa/parser/cxfa_layoutitem.cpp @@ -67,11 +67,8 @@ CFX_RectF CXFA_LayoutItem::GetRect(bool bRelative) const { auto pThis = static_cast(this); CFX_PointF sPos = pThis->m_sPos; CFX_SizeF sSize = pThis->m_sSize; - if (bRelative) { - CFX_RectF rtLayout; - rtLayout.Set(sPos.x, sPos.y, sSize.x, sSize.y); - return rtLayout; - } + if (bRelative) + return CFX_RectF(sPos, sSize); for (CXFA_LayoutItem* pLayoutItem = pThis->m_pParent; pLayoutItem; pLayoutItem = pLayoutItem->m_pParent) { @@ -99,10 +96,7 @@ CFX_RectF CXFA_LayoutItem::GetRect(bool bRelative) const { if (pLayoutItem->m_pFormNode->GetElementType() == XFA_Element::PageArea) break; } - - CFX_RectF rtLayout; - rtLayout.Set(sPos.x, sPos.y, sSize.x, sSize.y); - return rtLayout; + return CFX_RectF(sPos, sSize); } CXFA_LayoutItem* CXFA_LayoutItem::GetFirst() { -- cgit v1.2.3