summaryrefslogtreecommitdiff
path: root/fpdfsdk/formfiller/cffl_formfiller.cpp
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2017-06-29 18:28:58 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-06-30 18:36:15 +0000
commitd24236a926deeb8b9589c330c27dbd300b7f8c9d (patch)
tree42c0258195c44d73699723abc433edefc6e62b8e /fpdfsdk/formfiller/cffl_formfiller.cpp
parentf552ccab1d3ca232f9d2b4770ec40726e5047093 (diff)
downloadpdfium-d24236a926deeb8b9589c330c27dbd300b7f8c9d.tar.xz
Remove pointless CFX_FloatRect construction.
Also just call CFX_FloatRect() instead of explicitly writing out all zeros. Change-Id: I7574e64791d0c9ba613b14d0a613737dfbf39b12 Reviewed-on: https://pdfium-review.googlesource.com/7172 Reviewed-by: Ryan Harrison <rharrison@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fpdfsdk/formfiller/cffl_formfiller.cpp')
-rw-r--r--fpdfsdk/formfiller/cffl_formfiller.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index 80f725ba1a..281f0d74a7 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -6,6 +6,8 @@
#include "fpdfsdk/formfiller/cffl_formfiller.h"
+#include <utility>
+
#include "core/fpdfapi/page/cpdf_page.h"
#include "core/fxge/cfx_renderdevice.h"
#include "fpdfsdk/cpdfsdk_formfillenvironment.h"
@@ -54,8 +56,7 @@ CFX_FloatRect CFFL_FormFiller::GetWindowRect(CPDFSDK_PageView* pPageView) {
if (CPWL_Wnd* pWnd = GetPDFWindow(pPageView, false)) {
return pWnd->GetWindowRect();
}
-
- return CFX_FloatRect(0, 0, 0, 0);
+ return CFX_FloatRect();
}
FX_RECT CFFL_FormFiller::GetViewBBox(CPDFSDK_PageView* pPageView,
@@ -433,8 +434,7 @@ CFX_FloatRect CFFL_FormFiller::GetPDFWindowRect() const {
float fWidth = rectAnnot.right - rectAnnot.left;
float fHeight = rectAnnot.top - rectAnnot.bottom;
if ((m_pWidget->GetRotate() / 90) & 0x01)
- return CFX_FloatRect(0, 0, fHeight, fWidth);
-
+ std::swap(fWidth, fHeight);
return CFX_FloatRect(0, 0, fWidth, fHeight);
}
@@ -450,7 +450,7 @@ CFX_FloatRect CFFL_FormFiller::GetFocusBox(CPDFSDK_PageView* pPageView) {
if (rcPage.Contains(rcFocus))
return rcFocus;
}
- return CFX_FloatRect(0, 0, 0, 0);
+ return CFX_FloatRect();
}
CFX_FloatRect CFFL_FormFiller::FFLtoPWL(const CFX_FloatRect& rect) {