diff options
author | Dan Sinclair <dsinclair@chromium.org> | 2017-02-07 16:36:39 -0500 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-08 01:36:02 +0000 |
commit | bba2a7cf30da9e84bcc14ef32dbb0bb944229219 (patch) | |
tree | 94a74de8d07b3e395bf6e08a62811a3a0d652d19 /xfa/fxfa/parser/cxfa_layoutitem.cpp | |
parent | 55e026b7b6eec17b012c819c4a7d39e63094b5c4 (diff) | |
download | pdfium-bba2a7cf30da9e84bcc14ef32dbb0bb944229219.tar.xz |
Update to use CFX_Rect{F} and CFX_Matrix constructors.
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 <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/parser/cxfa_layoutitem.cpp')
-rw-r--r-- | xfa/fxfa/parser/cxfa_layoutitem.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
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<const CXFA_ContentLayoutItem*>(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() { |