Move xfa/include/fwl/{theme,lightwidget} to xfa/fwl

xfa/fwl/lightwidget/cfwl_widget.h

Index: xfa/fwl/lightwidget/cfwl_widget.h
diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/fwl/lightwidget/cfwl_widget.h
similarity index 70%
rename from xfa/include/fwl/lightwidget/widget.h
rename to xfa/fwl/lightwidget/cfwl_widget.h
index 38fe777fd2e05255565dbe2e67d5f049a2633cc0..f1b6715811295da1414e8ec72e4aa4de45e62539 100644
--- a/xfa/include/fwl/lightwidget/widget.h
+++ b/xfa/fwl/lightwidget/cfwl_widget.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_LIGHTWIDGET_WIDGET_H_
-#define XFA_INCLUDE_FWL_LIGHTWIDGET_WIDGET_H_
+#ifndef XFA_FWL_LIGHTWIDGET_CFWL_WIDGET_H_
+#define XFA_FWL_LIGHTWIDGET_CFWL_WIDGET_H_
 
 #include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_widgetimpproperties.h"
+#include "xfa/fwl/lightwidget/cfwl_widgetproperties.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 
 class CFWL_Event;
@@ -17,30 +17,6 @@ class CFWL_Widget;
 class CFWL_WidgetDelegate;
 class CFWL_WidgetMgr;
 
-class CFWL_WidgetProperties {
- public:
-  CFWL_WidgetProperties() {
-    m_ctmOnParent.SetIdentity();
-    m_rtWidget.Set(0, 0, 0, 0);
-    m_dwStyles = FWL_WGTSTYLE_Child;
-    m_dwStyleExes = 0;
-    m_dwStates = 0;
-    m_pParent = NULL;
-    m_pOwner = NULL;
-  }
-  CFWL_WidgetImpProperties MakeWidgetImpProperties(
-      IFWL_DataProvider* pDataProvider) const;
-
-  CFX_WideString m_wsWindowclass;
-  CFX_Matrix m_ctmOnParent;
-  CFX_RectF m_rtWidget;
-  uint32_t m_dwStyles;
-  uint32_t m_dwStyleExes;
-  uint32_t m_dwStates;
-  CFWL_Widget* m_pParent;
-  CFWL_Widget* m_pOwner;
-};
-
 class CFWL_Widget {
  public:
   virtual ~CFWL_Widget();
@@ -49,10 +25,6 @@ class CFWL_Widget {
   uint32_t GetClassID() const;
   virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const;
 
- protected:
-  FWL_ERR Initialize(const CFWL_WidgetProperties* pProperties = NULL);
-
- public:
   FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
   FWL_ERR GetGlobalRect(CFX_RectF& rect);
   FWL_ERR SetWidgetRect(const CFX_RectF& rect);
@@ -96,15 +68,9 @@ class CFWL_Widget {
   IFWL_WidgetDelegate* m_pDelegate;
   CFWL_WidgetMgr* m_pWidgetMgr;
   CFWL_WidgetProperties* m_pProperties;
-};
-class CFWL_WidgetDelegate {
- public:
-  CFWL_WidgetDelegate();
-  virtual ~CFWL_WidgetDelegate();
-  virtual int32_t OnProcessMessage(CFWL_Message* pMessage);
-  virtual FWL_ERR OnProcessEvent(CFWL_Event* pEvent);
-  virtual FWL_ERR OnDrawWidget(CFX_Graphics* pGraphics,
-                               const CFX_Matrix* pMatrix = NULL);
+
+ protected:
+  FWL_ERR Initialize(const CFWL_WidgetProperties* pProperties = NULL);
 };
 
-#endif  // XFA_INCLUDE_FWL_LIGHTWIDGET_WIDGET_H_
+#endif  // XFA_FWL_LIGHTWIDGET_CFWL_WIDGET_H_