diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-05-02 21:14:27 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-02 21:14:27 +0000 |
| commit | 6312bf94bb44e2edeb855008da0921c13103f66a (patch) | |
| tree | edafcb079272c4a20abc587861d5df492846a5fc /xfa/fxfa/cxfa_ffwidget.cpp | |
| parent | fceaf42fb5930070415703e448ecce39e9dc0522 (diff) | |
| download | pdfium-6312bf94bb44e2edeb855008da0921c13103f66a.tar.xz | |
Use pointer instead of ref for XFA_RectWithoutMargin param.chromium/3418
Removed many null checks since XFA_RectWithoutMargin already checks
if the margin is null internally.
Change-Id: I21f5101fe38559eb02f4c3aaf081ff29ce293e47
Reviewed-on: https://pdfium-review.googlesource.com/31993
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'xfa/fxfa/cxfa_ffwidget.cpp')
| -rw-r--r-- | xfa/fxfa/cxfa_ffwidget.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp index 96c611e3f7..8b2e826165 100644 --- a/xfa/fxfa/cxfa_ffwidget.cpp +++ b/xfa/fxfa/cxfa_ffwidget.cpp @@ -209,12 +209,12 @@ RetainPtr<CFX_DIBitmap> XFA_LoadImageFromBuffer( return pBitmap; } -void XFA_RectWithoutMargin(CFX_RectF& rt, const CXFA_Margin* margin, bool bUI) { +void XFA_RectWithoutMargin(CFX_RectF* rt, const CXFA_Margin* margin) { if (!margin) return; - rt.Deflate(margin->GetLeftInset(), margin->GetTopInset(), - margin->GetRightInset(), margin->GetBottomInset()); + rt->Deflate(margin->GetLeftInset(), margin->GetTopInset(), + margin->GetRightInset(), margin->GetBottomInset()); } CXFA_FFWidget* XFA_GetWidgetFromLayoutItem(CXFA_LayoutItem* pLayoutItem) { @@ -298,8 +298,7 @@ void CXFA_FFWidget::RenderWidget(CXFA_Graphics* pGS, CFX_RectF rtBorder = GetRectWithoutRotate(); CXFA_Margin* margin = border->GetMarginIfExists(); - if (margin) - XFA_RectWithoutMargin(rtBorder, margin); + XFA_RectWithoutMargin(&rtBorder, margin); rtBorder.Normalize(); DrawBorder(pGS, border, rtBorder, matrix); |