Change CFWL_Widget::GetMatrix to return the matrix

xfa/fwl/cfwl_widget.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/cfwl_widget.h"
 
 #include <algorithm>
 #include <utility>
@@ skipping 177 matching lines @@
     fy += szOffset.y;
     return;
   }
   CFX_RectF r;
   CFX_Matrix m;
   CFWL_Widget* parent = GetParent();
   if (parent) {
     r = GetWidgetRect();
     fx += r.left;
     fy += r.top;
-    GetMatrix(m, true);
+    m = GetMatrix();
     m.TransformPoint(fx, fy);
   }
   CFWL_Widget* form1 = m_pWidgetMgr->GetSystemFormWidget(this);
   if (!form1)
     return;
 
   if (!pWidget) {
     r = form1->GetWidgetRect();
     fx += r.left;
     fy += r.top;
     return;
   }
   CFWL_Widget* form2 = m_pWidgetMgr->GetSystemFormWidget(pWidget);
   if (!form2)
     return;
   if (form1 != form2) {
     r = form1->GetWidgetRect();
     fx += r.left;
     fy += r.top;
     r = form2->GetWidgetRect();
     fx -= r.left;
     fy -= r.top;
   }
   parent = pWidget->GetParent();
   if (parent) {
-    pWidget->GetMatrix(m, true);
     CFX_Matrix m1;
-    m1.SetIdentity();
-    m1.SetReverse(m);
+    m1.SetReverse(pWidget->GetMatrix());
     m1.TransformPoint(fx, fy);
     r = pWidget->GetWidgetRect();
     fx -= r.left;
     fy -= r.top;
   }
 }
 
-void CFWL_Widget::GetMatrix(CFX_Matrix& matrix, bool bGlobal) {
+CFX_Matrix CFWL_Widget::GetMatrix() {
   if (!m_pProperties)
-    return;
-  if (!bGlobal) {

[Tom Sepez, 2016/12/08 19:23:07]

really?  really? sigh.

-    matrix.SetIdentity();
-    return;
-  }
+    return CFX_Matrix();
 
   CFWL_Widget* parent = GetParent();
   CFX_ArrayTemplate<CFWL_Widget*> parents;
   while (parent) {
     parents.Add(parent);
     parent = parent->GetParent();
   }
-  matrix.SetIdentity();
+
+  CFX_Matrix matrix;
   CFX_Matrix ctmOnParent;
   CFX_RectF rect;
   int32_t count = parents.GetSize();
   for (int32_t i = count - 2; i >= 0; i--) {
     parent = parents.GetAt(i);
-    parent->GetMatrix(ctmOnParent, false);
+
+    if (parent->m_pProperties)
+      ctmOnParent.SetIdentity();
     rect = parent->GetWidgetRect();
     matrix.Concat(ctmOnParent, true);
     matrix.Translate(rect.left, rect.top, true);
   }
   CFX_Matrix m;
   m.SetIdentity();
   matrix.Concat(m, true);
   parents.RemoveAll();
+
+  return matrix;
 }
 
 IFWL_ThemeProvider* CFWL_Widget::GetThemeProvider() const {
   return m_pProperties->m_pThemeProvider;
 }
 
 void CFWL_Widget::SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) {
   m_pProperties->m_pThemeProvider = pThemeProvider;
 }
 
@@ skipping 433 matching lines @@
     }
     default:
       break;
   }
 }
 
 void CFWL_Widget::OnProcessEvent(CFWL_Event* pEvent) {}
 
 void CFWL_Widget::OnDrawWidget(CFX_Graphics* pGraphics,
                                const CFX_Matrix* pMatrix) {}