Move xfa/include/fwl/{core,basewidget} to xfa/fwl/{core,basewidget}.

xfa/fwl/core/ifwl_themeprovider.h

Index: xfa/fwl/core/ifwl_themeprovider.h
diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/fwl/core/ifwl_themeprovider.h
similarity index 67%
rename from xfa/include/fwl/core/fwl_theme.h
rename to xfa/fwl/core/ifwl_themeprovider.h
index 7dd443e506a4fe563dc9d2580e6e57ad59e0cfd4..2bdacd5947912ea0ec7b8067ea226bdb37a02a70 100644
--- a/xfa/include/fwl/core/fwl_theme.h
+++ b/xfa/fwl/core/ifwl_themeprovider.h
@@ -4,17 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_CORE_FWL_THEME_H_
-#define XFA_INCLUDE_FWL_CORE_FWL_THEME_H_
+#ifndef XFA_FWL_CORE_IFWL_THEMEPROVIDER_H_
+#define XFA_FWL_CORE_IFWL_THEMEPROVIDER_H_
 
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_system.h"
-#include "xfa/include/fwl/core/fwl_error.h"
-
-class IFWL_Widget;
-class CFX_Graphics;
-class CFX_DIBitmap;
-class CFX_Path;
+#include "xfa/fwl/core/fwl_error.h"
 
 #define FWL_WGTCAPACITY_CXBorder 1
 #define FWL_WGTCAPACITY_CYBorder 2
@@ -31,36 +26,11 @@ class CFX_Path;
 #define FWL_WGTCAPACITY_SpaceAboveBelow 13
 #define FWL_WGTCAPACITY_MAX 65535
 
-class CFWL_ThemePart {
- public:
-  CFWL_ThemePart()
-      : m_pWidget(NULL), m_iPart(0), m_dwStates(0), m_dwData(0), m_pData(NULL) {
-    m_rtPart.Reset();
-    m_matrix.SetIdentity();
-  }
-  CFX_Matrix m_matrix;
-  CFX_RectF m_rtPart;
-  IFWL_Widget* m_pWidget;
-  int32_t m_iPart;
-  FX_DWORD m_dwStates;
-  FX_DWORD m_dwData;
-  void* m_pData;
-};
-class CFWL_ThemeBackground : public CFWL_ThemePart {
- public:
-  CFWL_ThemeBackground() : m_pGraphics(NULL), m_pImage(NULL), m_pPath(NULL) {}
-  CFX_Graphics* m_pGraphics;
-  CFX_DIBitmap* m_pImage;
-  CFX_Path* m_pPath;
-};
-class CFWL_ThemeText : public CFWL_ThemePart {
- public:
-  CFWL_ThemeText() : m_pGraphics(NULL) {}
-  CFX_WideString m_wsText;
-  FX_DWORD m_dwTTOStyles;
-  int32_t m_iTTOAlign;
-  CFX_Graphics* m_pGraphics;
-};
+class CFWL_ThemeBackground;
+class CFWL_ThemePart;
+class CFWL_ThemeText;
+class IFWL_Widget;
+
 class IFWL_ThemeProvider {
  public:
   virtual ~IFWL_ThemeProvider() {}
@@ -85,4 +55,4 @@ class IFWL_ThemeProvider {
   virtual FX_BOOL CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) = 0;
 };
 
-#endif  // XFA_INCLUDE_FWL_CORE_FWL_THEME_H_
+#endif  // XFA_FWL_CORE_IFWL_THEMEPROVIDER_H_