Merge the CFWL_*Imp classes into the IFWL_* classes.

xfa/fwl/core/ifwl_scrollbar.h

 // 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
 
-#ifndef XFA_FWL_BASEWIDGET_FWL_SCROLLBARIMP_H_
-#define XFA_FWL_BASEWIDGET_FWL_SCROLLBARIMP_H_
+#ifndef XFA_FWL_CORE_IFWL_SCROLLBAR_H_
+#define XFA_FWL_CORE_IFWL_SCROLLBAR_H_
 
-#include "xfa/fwl/core/fwl_widgetimp.h"
+#include "core/fxcrt/fx_system.h"
+#include "xfa/fwl/core/cfwl_widgetimpproperties.h"
+#include "xfa/fwl/core/fwl_error.h"
+#include "xfa/fwl/core/ifwl_dataprovider.h"
 #include "xfa/fwl/core/ifwl_timer.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 
+class CFWL_ScrollBarImpDelegate;
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
-class CFWL_ScrollBarImpDelegate;
 
-class CFWL_ScrollBarImp : public CFWL_WidgetImp, public IFWL_Timer {
+#define FWL_CLASS_ScrollBar L"FWL_SCROLLBAR"
+#define FWL_STYLEEXT_SCB_Horz (0L << 0)
+#define FWL_STYLEEXT_SCB_Vert (1L << 0)
+
+enum FWL_SCBCODE {
+  FWL_SCBCODE_None = 1,
+  FWL_SCBCODE_Min,
+  FWL_SCBCODE_Max,
+  FWL_SCBCODE_PageBackward,
+  FWL_SCBCODE_PageForward,
+  FWL_SCBCODE_StepBackward,
+  FWL_SCBCODE_StepForward,
+  FWL_SCBCODE_Pos,
+  FWL_SCBCODE_TrackPos,
+  FWL_SCBCODE_EndScroll,
+};
+
+class IFWL_ScrollBarDP : public IFWL_DataProvider {};
+
+class IFWL_ScrollBar : public IFWL_Widget, public IFWL_Timer {
  public:
-  CFWL_ScrollBarImp(const CFWL_WidgetImpProperties& properties,
-                    IFWL_Widget* pOuter);
-  ~CFWL_ScrollBarImp() override;
+  static IFWL_ScrollBar* Create(const CFWL_WidgetImpProperties& properties,
+                                IFWL_Widget* pOuter);
 
-  // CFWL_WidgetImp
+  IFWL_ScrollBar(const CFWL_WidgetImpProperties& properties,
+                 IFWL_Widget* pOuter);
+  ~IFWL_ScrollBar() override;
+
+  // IFWL_Widget
   FWL_Error GetClassName(CFX_WideString& wsClass) const override;
   FWL_Type GetClassID() const override;
   FWL_Error Initialize() override;
   FWL_Error Finalize() override;
   FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override;
   FWL_Error Update() override;
   FWL_Error DrawWidget(CFX_Graphics* pGraphics,
                        const CFX_Matrix* pMatrix = nullptr) override;
 
   // IFWL_Timer
@@ skipping 62 matching lines @@
   FX_FLOAT m_fButtonLen;
   FX_BOOL m_bMinSize;
   CFX_RectF m_rtClient;
   CFX_RectF m_rtThumb;
   CFX_RectF m_rtMinBtn;
   CFX_RectF m_rtMaxBtn;
   CFX_RectF m_rtMinTrack;
   CFX_RectF m_rtMaxTrack;
   FX_BOOL m_bCustomLayout;
   FX_FLOAT m_fMinThumb;
+
+ protected:
+  IFWL_ScrollBar();
 };
 
 class CFWL_ScrollBarImpDelegate : public CFWL_WidgetImpDelegate {
  public:
-  CFWL_ScrollBarImpDelegate(CFWL_ScrollBarImp* pOwner);
+  CFWL_ScrollBarImpDelegate(IFWL_ScrollBar* pOwner);
   void OnProcessMessage(CFWL_Message* pMessage) override;
   void OnDrawWidget(CFX_Graphics* pGraphics,
                     const CFX_Matrix* pMatrix = nullptr) override;
 
  protected:
   void OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
   void OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
   void OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
   void OnMouseLeave();
   void OnMouseWheel(FX_FLOAT fx,
@@ skipping 12 matching lines @@
                  FX_FLOAT fx,
                  FX_FLOAT fy);
   void DoMouseMove(int32_t iItem,
                    const CFX_RectF& rtItem,
                    int32_t& iState,
                    FX_FLOAT fx,
                    FX_FLOAT fy);
   void DoMouseLeave(int32_t iItem, const CFX_RectF& rtItem, int32_t& iState);
   void DoMouseHover(int32_t iItem, const CFX_RectF& rtItem, int32_t& iState);
 
-  CFWL_ScrollBarImp* m_pOwner;
+  IFWL_ScrollBar* m_pOwner;
 };
 
-#endif  // XFA_FWL_BASEWIDGET_FWL_SCROLLBARIMP_H_
+#endif  // XFA_FWL_CORE_IFWL_SCROLLBAR_H_