From 5500da04e3acfa98baf9befb5d91fb787d599341 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 20 Nov 2015 10:13:18 -0800 Subject: Merge to XFA: Remove CFX_Matrix::Reset() Original Review URL: https://codereview.chromium.org/1459243002 . (cherry picked from commit 6fc00fafcbac1fd5edd767fe2d4a8e4a9ef52806) R=thestig@chromium.org Review URL: https://codereview.chromium.org/1461703008 . --- xfa/include/fwl/core/fwl_theme.h | 2 +- xfa/include/fwl/core/fwl_widget.h | 2 +- xfa/include/fwl/lightwidget/widget.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/include') diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h index 3dfe7c74e1..d3704c89d1 100644 --- a/xfa/include/fwl/core/fwl_theme.h +++ b/xfa/include/fwl/core/fwl_theme.h @@ -31,7 +31,7 @@ class CFWL_ThemePart { CFWL_ThemePart() : m_pWidget(NULL), m_iPart(0), m_dwStates(0), m_dwData(0), m_pData(NULL) { m_rtPart.Reset(); - m_matrix.Reset(); + m_matrix.SetIdentity(); } CFX_Matrix m_matrix; CFX_RectF m_rtPart; diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h index f7ddb5cebd..acada467b4 100644 --- a/xfa/include/fwl/core/fwl_widget.h +++ b/xfa/include/fwl/core/fwl_widget.h @@ -70,7 +70,7 @@ class IFWL_WidgetDelegate { class CFWL_WidgetImpProperties { public: CFWL_WidgetImpProperties() { - m_ctmOnParent.Reset(); + m_ctmOnParent.SetIdentity(); m_rtWidget.Set(0, 0, 0, 0); m_dwStyles = FWL_WGTSTYLE_Child; m_dwStyleExes = 0; diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h index c6a7e4b80e..c597194336 100644 --- a/xfa/include/fwl/lightwidget/widget.h +++ b/xfa/include/fwl/lightwidget/widget.h @@ -16,7 +16,7 @@ class CFWL_WidgetDelegate; class CFWL_WidgetProperties { public: CFWL_WidgetProperties() { - m_ctmOnParent.Reset(); + m_ctmOnParent.SetIdentity(); m_rtWidget.Set(0, 0, 0, 0); m_dwStyles = FWL_WGTSTYLE_Child; m_dwStyleExes = 0; -- cgit v1.2.3