summaryrefslogtreecommitdiff
path: root/xfa/fwl/cfwl_widgetmgr.cpp
diff options
context:
space:
mode:
authordsinclair <dsinclair@chromium.org>2016-12-08 19:45:00 -0800
committerCommit bot <commit-bot@chromium.org>2016-12-08 19:45:00 -0800
commit1babeeed9c259b9d486b4cbee949253769d18fff (patch)
tree83a4e29dea3781a58f66d2b42427d1f18490b17a /xfa/fwl/cfwl_widgetmgr.cpp
parent94afac986c9d6232b7791acff4f23d99fbd004ae (diff)
downloadpdfium-1babeeed9c259b9d486b4cbee949253769d18fff.tar.xz
Change CFWL_Widget::GetMatrix to return the matrix
This CL switches to using a return value instead of an out parameter. The global flag was also removed and the call sites changed to just SetIdentity as appropriate. Review-Url: https://codereview.chromium.org/2564443003
Diffstat (limited to 'xfa/fwl/cfwl_widgetmgr.cpp')
-rw-r--r--xfa/fwl/cfwl_widgetmgr.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/xfa/fwl/cfwl_widgetmgr.cpp b/xfa/fwl/cfwl_widgetmgr.cpp
index f01c02b6b8..e7eca100cc 100644
--- a/xfa/fwl/cfwl_widgetmgr.cpp
+++ b/xfa/fwl/cfwl_widgetmgr.cpp
@@ -298,7 +298,6 @@ CFWL_Widget* CFWL_WidgetMgr::GetWidgetAtPoint(CFWL_Widget* parent,
x1 = x;
y1 = y;
CFX_Matrix matrixOnParent;
- child->GetMatrix(matrixOnParent, false);
CFX_Matrix m;
m.SetIdentity();
m.SetReverse(matrixOnParent);
@@ -528,7 +527,7 @@ void CFWL_WidgetMgr::DrawChild(CFWL_Widget* parent,
CFX_Matrix widgetMatrix;
CFX_RectF clipBounds(rtWidget);
if (!bFormDisable)
- child->GetMatrix(widgetMatrix, true);
+ widgetMatrix = child->GetMatrix();
if (pMatrix)
widgetMatrix.Concat(*pMatrix);