diff options
| author | Jane Liu <janeliulwq@google.com> | 2017-08-22 10:50:06 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-22 16:42:55 +0000 |
| commit | 878b27de2fa8e5bdc3b910c98846f4b43185d4aa (patch) | |
| tree | f21a9528354ebf533a637f5ea0e8edaa44be7427 /fpdfsdk/pwl | |
| parent | aac59a0e59052366e260396165a759b5b0e80188 (diff) | |
| download | pdfium-878b27de2fa8e5bdc3b910c98846f4b43185d4aa.tar.xz | |
Converted CFX_Matrix::TransformRect() to take in consts
Currently, all three of CFX_Matrix::TransformRect() take in rect values
and modify them in place.
This CL converts them to take in constant values and return the
transformed values instead, and fixes all the call sites.
Bug=pdfium:874
Change-Id: I9c274df3b14e9d88c100ba0530068e06e8fec32b
Reviewed-on: https://pdfium-review.googlesource.com/11550
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Jane Liu <janeliulwq@google.com>
Diffstat (limited to 'fpdfsdk/pwl')
| -rw-r--r-- | fpdfsdk/pwl/cpwl_edit_impl.cpp | 7 | ||||
| -rw-r--r-- | fpdfsdk/pwl/cpwl_wnd.cpp | 8 |
2 files changed, 5 insertions, 10 deletions
diff --git a/fpdfsdk/pwl/cpwl_edit_impl.cpp b/fpdfsdk/pwl/cpwl_edit_impl.cpp index f26811e137..5d7a44c623 100644 --- a/fpdfsdk/pwl/cpwl_edit_impl.cpp +++ b/fpdfsdk/pwl/cpwl_edit_impl.cpp @@ -468,11 +468,8 @@ void CPWL_EditImpl::DrawEdit(CFX_RenderDevice* pDevice, int32_t nFontIndex = -1; CFX_PointF ptBT; CFX_RenderDevice::StateRestorer restorer(pDevice); - if (!rcClip.IsEmpty()) { - CFX_FloatRect rcTemp = rcClip; - mtUser2Device.TransformRect(rcTemp); - pDevice->SetClip_Rect(rcTemp.ToFxRect()); - } + if (!rcClip.IsEmpty()) + pDevice->SetClip_Rect(mtUser2Device.TransformRect(rcClip).ToFxRect()); CPWL_EditImpl_Iterator* pIterator = pEdit->GetIterator(); IPVT_FontMap* pFontMap = pEdit->GetFontMap(); diff --git a/fpdfsdk/pwl/cpwl_wnd.cpp b/fpdfsdk/pwl/cpwl_wnd.cpp index 96a3720daf..0198c63d6a 100644 --- a/fpdfsdk/pwl/cpwl_wnd.cpp +++ b/fpdfsdk/pwl/cpwl_wnd.cpp @@ -738,9 +738,8 @@ CFX_Matrix CPWL_Wnd::GetWindowMatrix() const { } FX_RECT CPWL_Wnd::PWLtoWnd(const CFX_FloatRect& rect) const { - CFX_FloatRect rcTemp = rect; CFX_Matrix mt = GetWindowMatrix(); - mt.TransformRect(rcTemp); + CFX_FloatRect rcTemp = mt.TransformRect(rect); return FX_RECT((int32_t)(rcTemp.left + 0.5), (int32_t)(rcTemp.bottom + 0.5), (int32_t)(rcTemp.right + 0.5), (int32_t)(rcTemp.top + 0.5)); } @@ -764,9 +763,8 @@ CFX_FloatRect CPWL_Wnd::ParentToChild(const CFX_FloatRect& rect) const { CFX_Matrix inverse = mt.GetInverse(); if (!inverse.IsIdentity()) mt = inverse; - CFX_FloatRect rc = rect; - mt.TransformRect(rc); - return rc; + + return mt.TransformRect(rect); } CFX_Matrix CPWL_Wnd::GetChildToRoot() const { |