summaryrefslogtreecommitdiff
path: root/xfa/src/fwl
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-11-20 10:13:18 -0800
committerTom Sepez <tsepez@chromium.org>2015-11-20 10:13:18 -0800
commit5500da04e3acfa98baf9befb5d91fb787d599341 (patch)
tree8f21f3af2329daf938d8cc0f298fe22668cf1a05 /xfa/src/fwl
parent0afbad0509578a5fee6fec4394d6b3c55425cf28 (diff)
downloadpdfium-5500da04e3acfa98baf9befb5d91fb787d599341.tar.xz
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 .
Diffstat (limited to 'xfa/src/fwl')
-rw-r--r--xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp4
-rw-r--r--xfa/src/fwl/src/core/fwl_widgetimp.cpp4
-rw-r--r--xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp2
-rw-r--r--xfa/src/fwl/src/lightwidget/picturebox.cpp2
-rw-r--r--xfa/src/fwl/src/theme/checkboxtp.cpp2
-rw-r--r--xfa/src/fwl/src/theme/widgettp.cpp2
6 files changed, 8 insertions, 8 deletions
diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp
index c3d3192361..0eaeaa41c2 100644
--- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp
@@ -29,7 +29,7 @@ CFWL_PictureBoxImp::CFWL_PictureBoxImp(IFWL_Widget* pOuter)
m_bButton(FALSE) {
m_rtClient.Reset();
m_rtImage.Reset();
- m_matrix.Reset();
+ m_matrix.SetIdentity();
}
CFWL_PictureBoxImp::CFWL_PictureBoxImp(
const CFWL_WidgetImpProperties& properties,
@@ -40,7 +40,7 @@ CFWL_PictureBoxImp::CFWL_PictureBoxImp(
m_bButton(FALSE) {
m_rtClient.Reset();
m_rtImage.Reset();
- m_matrix.Reset();
+ m_matrix.SetIdentity();
}
CFWL_PictureBoxImp::~CFWL_PictureBoxImp() {}
FWL_ERR CFWL_PictureBoxImp::GetClassName(CFX_WideString& wsClass) const {
diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp
index 5a5fcab173..18a23012aa 100644
--- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp
@@ -401,7 +401,7 @@ FWL_ERR CFWL_WidgetImp::TransformTo(IFWL_Widget* pWidget,
if (parent) {
pWidget->GetMatrix(m, TRUE);
CFX_Matrix m1;
- m1.Reset();
+ m1.SetIdentity();
m1.SetReverse(m);
m1.TransformPoint(fx, fy);
pWidget->GetWidgetRect(r);
@@ -422,7 +422,7 @@ FWL_ERR CFWL_WidgetImp::GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal) {
parents.Add(parent);
parent = parent->GetParent();
}
- matrix.Reset();
+ matrix.SetIdentity();
CFX_Matrix ctmOnParent;
CFX_RectF rect;
int32_t count = parents.GetSize();
diff --git a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
index 00bebaed90..7fe82b3428 100644
--- a/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_widgetmgrimp.cpp
@@ -463,7 +463,7 @@ IFWL_Widget* CFWL_WidgetMgr::GetWidgetAtPoint(IFWL_Widget* parent,
CFX_Matrix matrixOnParent;
child->GetMatrix(matrixOnParent);
CFX_Matrix m;
- m.Reset();
+ m.SetIdentity();
m.SetReverse(matrixOnParent);
m.TransformPoint(x1, y1);
CFX_RectF bounds;
diff --git a/xfa/src/fwl/src/lightwidget/picturebox.cpp b/xfa/src/fwl/src/lightwidget/picturebox.cpp
index bb339a82aa..d4971306ca 100644
--- a/xfa/src/fwl/src/lightwidget/picturebox.cpp
+++ b/xfa/src/fwl/src/lightwidget/picturebox.cpp
@@ -112,7 +112,7 @@ FWL_ERR CFWL_PictureBox::CFWL_PictureBoxDP::GetMatrix(IFWL_Widget* pWidget,
pWidget->GetClientRect(rect);
FX_FLOAT fLen = rect.width / 2;
FX_FLOAT fWid = rect.height / 2;
- matrix.Reset();
+ matrix.SetIdentity();
matrix.Translate(-fLen, -fWid);
matrix.Rotate(m_fRotation);
matrix.Translate(fLen, fWid);
diff --git a/xfa/src/fwl/src/theme/checkboxtp.cpp b/xfa/src/fwl/src/theme/checkboxtp.cpp
index e488918ee3..c1856a9f80 100644
--- a/xfa/src/fwl/src/theme/checkboxtp.cpp
+++ b/xfa/src/fwl/src/theme/checkboxtp.cpp
@@ -247,7 +247,7 @@ void CFWL_CheckBoxTP::DrawSignCheck(CFX_Graphics* pGraphics,
initCheckPath(pRtSign->width);
}
CFX_Matrix mt;
- mt.Reset();
+ mt.SetIdentity();
mt.Translate(pRtSign->left, pRtSign->top);
mt.Concat(*pMatrix);
CFX_Color crFill(argbFill);
diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/src/theme/widgettp.cpp
index b6052484d3..fb1803f85b 100644
--- a/xfa/src/fwl/src/theme/widgettp.cpp
+++ b/xfa/src/fwl/src/theme/widgettp.cpp
@@ -144,7 +144,7 @@ FX_BOOL CFWL_WidgetTP::CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) {
}
FWL_ERR CFWL_WidgetTP::Initialize() {
m_dwThemeID = 0;
- _ctm.Reset();
+ _ctm.SetIdentity();
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_WidgetTP::Finalize() {