2 files changed, 4 insertions, 4 deletions
diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp
index 4863676d7c..d196203b9f 100644
--- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp
@@ -106,7 +106,7 @@ CFWL_ScrollBarImp::CFWL_ScrollBarImp(IFWL_Widget* pOuter)
 CFWL_ScrollBarImp::CFWL_ScrollBarImp(const CFWL_WidgetImpProperties& properties,
                                      IFWL_Widget* pOuter)
     : CFWL_WidgetImp(properties, pOuter),
-      m_hTimer(NULL),
+      m_hTimer(nullptr),
       m_fRangeMin(0),
       m_fRangeMax(-1),
       m_fPageSize(0),
@@ -116,11 +116,11 @@ CFWL_ScrollBarImp::CFWL_ScrollBarImp(const CFWL_WidgetImpProperties& properties,
       m_iMinButtonState(FWL_PARTSTATE_SCB_Normal),
       m_iMaxButtonState(FWL_PARTSTATE_SCB_Normal),
       m_iThumbButtonState(FWL_PARTSTATE_SCB_Normal),
+      m_iMinTrackState(FWL_PARTSTATE_SCB_Normal),
+      m_iMaxTrackState(FWL_PARTSTATE_SCB_Normal),
       m_fLastTrackPos(0),
       m_cpTrackPointX(0),
       m_cpTrackPointY(0),
-      m_iMinTrackState(FWL_PARTSTATE_SCB_Normal),
-      m_iMaxTrackState(FWL_PARTSTATE_SCB_Normal),
       m_iMouseWheel(0),
       m_bTrackMouseLeave(FALSE),
       m_bMouseHover(FALSE),
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h b/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
index 319182becc..896c6edb7f 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
@@ -62,11 +62,11 @@ class CFWL_ScrollBarImp : public CFWL_WidgetImp, public IFWL_Timer {
   void CalcThumbButtonRect(CFX_RectF& rect);
   void CalcMinTrackRect(CFX_RectF& rect);
   void CalcMaxTrackRect(CFX_RectF& rect);
-
   FX_FLOAT GetTrackPointPos(FX_FLOAT fx, FX_FLOAT fy);
   void GetTrackRect(CFX_RectF& rect, FX_BOOL bLower = TRUE);
   FX_BOOL SendEvent();
   FX_BOOL OnScroll(FX_DWORD dwCode, FX_FLOAT fPos);
+
   FWL_HTIMER m_hTimer;
   FX_FLOAT m_fRangeMin;
   FX_FLOAT m_fRangeMax;