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>

5 files changed, 9 insertions, 19 deletions

diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index e0d02d0f4c..f682122083 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -456,15 +456,11 @@ CFX_FloatRect CFFL_FormFiller::GetFocusBox(CPDFSDK_PageView* pPageView) {
 }
 
 CFX_FloatRect CFFL_FormFiller::FFLtoPWL(const CFX_FloatRect& rect) {
-  CFX_FloatRect temp = rect;
-  GetCurMatrix().GetInverse().TransformRect(temp);
-  return temp;
+  return GetCurMatrix().GetInverse().TransformRect(rect);
 }
 
 CFX_FloatRect CFFL_FormFiller::PWLtoFFL(const CFX_FloatRect& rect) {
-  CFX_FloatRect temp = rect;
-  GetCurMatrix().TransformRect(temp);
-  return temp;
+  return GetCurMatrix().TransformRect(rect);
 }
 
 CFX_PointF CFFL_FormFiller::FFLtoPWL(const CFX_PointF& point) {
diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp
index 5be322a9b0..b8e84c8cc4 100644
--- a/fpdfsdk/fpdf_flatten.cpp
+++ b/fpdfsdk/fpdf_flatten.cpp
@@ -222,7 +222,7 @@ CFX_Matrix GetMatrix(CFX_FloatRect rcAnnot,
   if (rcStream.IsEmpty())
     return CFX_Matrix();
 
-  matrix.TransformRect(rcStream);
+  rcStream = matrix.TransformRect(rcStream);
   rcStream.Normalize();
 
   float a = rcAnnot.Width() / rcStream.Width();
diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp
index 489053080c..79155e52d5 100644
--- a/fpdfsdk/fpdfeditpage.cpp
+++ b/fpdfsdk/fpdfeditpage.cpp
@@ -299,10 +299,9 @@ FPDF_EXPORT void FPDF_CALLCONV FPDFPage_TransformAnnots(FPDF_PAGE page,
   CPDF_AnnotList AnnotList(pPage);
   for (size_t i = 0; i < AnnotList.Count(); ++i) {
     CPDF_Annot* pAnnot = AnnotList.GetAt(i);
-    CFX_FloatRect rect = pAnnot->GetRect();  // transformAnnots Rectangle
     CFX_Matrix matrix((float)a, (float)b, (float)c, (float)d, (float)e,
                       (float)f);
-    matrix.TransformRect(rect);
+    CFX_FloatRect rect = matrix.TransformRect(pAnnot->GetRect());
 
     CPDF_Dictionary* pAnnotDict = pAnnot->GetAnnotDict();
     CPDF_Array* pRectArray = pAnnotDict->GetArrayFor("Rect");
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 {