Re-land "Rename CFWL_Thread classes to ThreadImp"

This reverts commit 5e4f290e939ded90a518ff8eab1db59930655e11.

BUG=
R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1502063005 .

5 files changed, 90 insertions, 89 deletions

diff --git a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h
index 12b155db90..570e53349a 100644
--- a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h
+++ b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h
@@ -4,11 +4,10 @@
 

 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

-#ifndef _FWL_ADAPTER_THREAD_H

-#define _FWL_ADAPTER_THREAD_H

+#ifndef FWL_ADAPTERTHREADMGR_H_

+#define FWL_ADAPTERTHREADMGR_H_

+

 class IFWL_Thread;

-class IFWL_AdapterMutex;

-class IFWL_AdapterSemaphore;

 

 class IFWL_AdapterThreadMgr {

  public:

@@ -22,14 +21,4 @@ class IFWL_AdapterThreadMgr {
   virtual FWL_ERR Stop(FWL_HTHREAD hThread, int32_t iExitCode) = 0;

   virtual IFWL_Thread* GetCurrentThread() = 0;

 };

-class IFWL_AdapterSemaphore {

- public:

-  virtual ~IFWL_AdapterSemaphore() {}

-  static IFWL_AdapterSemaphore* Create();

-  virtual FWL_ERR Destroy() = 0;

-  virtual FWL_ERR Wait() const = 0;

-  virtual FWL_ERR Post() = 0;

-  virtual FWL_ERR Value(FX_DWORD& val) const = 0;

-  virtual FWL_ERR Reset(int32_t init) = 0;

-};

-#endif

+#endif  // FWL_ADAPTERTHREADMGR_H_

diff --git a/xfa/include/fwl/core/fwl_app.h b/xfa/include/fwl/core/fwl_app.h
index 8959726d43..1817b72cfe 100644
--- a/xfa/include/fwl/core/fwl_app.h
+++ b/xfa/include/fwl/core/fwl_app.h
@@ -12,16 +12,21 @@ class IFWL_Widget;
 class IFWL_WidgetMgr;

 class IFWL_ThemeProvider;

 class IFWL_AdapterWidgetMgr;

-class IFWL_App;

+

 class IFWL_App : public IFWL_NoteThread {

  public:

   static IFWL_App* Create(IFWL_AdapterNative* pAdapter);

-  virtual FWL_ERR Initialize() = 0;

-  virtual FWL_ERR Finalize() = 0;

-  virtual IFWL_AdapterNative* GetAdapterNative() = 0;

-  virtual IFWL_WidgetMgr* GetWidgetMgr() = 0;

-  virtual FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) = 0;

-  virtual FWL_ERR Exit(int32_t iExitCode = 0) = 0;

+

+  FWL_ERR Initialize();

+  FWL_ERR Finalize();

+  IFWL_AdapterNative* GetAdapterNative();

+  IFWL_WidgetMgr* GetWidgetMgr();

+  IFWL_ThemeProvider* GetThemeProvider();

+  FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider);

+  FWL_ERR Exit(int32_t iExitCode);

+

+ private:

+  IFWL_App() {}

 };

 IFWL_App* FWL_GetApp();

 void FWL_SetApp(IFWL_App* pApp);

diff --git a/xfa/include/fwl/core/fwl_thread.h b/xfa/include/fwl/core/fwl_thread.h
index 3bc5c3c289..ed1fd9fc43 100644
--- a/xfa/include/fwl/core/fwl_thread.h
+++ b/xfa/include/fwl/core/fwl_thread.h
@@ -4,47 +4,48 @@
 

 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

-#ifndef _FWL_THREAD_H

-#define _FWL_THREAD_H

+#ifndef FWL_THREAD_H_

+#define FWL_THREAD_H_

+

+// The FWL thread/app code contains three parallel inheritance hierarchies,

+// which reference each other via pointers as follows:

+//

+//                                           m_pImpl

+//      (nonesuch)              IFWL_Thread ----------> CFWL_ThreadImp

+//                                   |      <----------      |

+//                                   A       m_pIface        A

+//                                   |                       |

+//      (nonesuch)              IFWL_NoteThread         CFWL_NoteThreadImp

+//                                   |                       |

+//                                   A                       A

+//                m_pIface           |                       |

+//      CFWL_App --------------> IFWL_App                CFWL_AppImp

+//

+

+class CFWL_ThreadImp;

 class IFWL_NoteDriver;

-class IFWL_Thread;

-class IFWL_NoteThread;

+

 typedef struct _FWL_HTHREAD { void* pData; } * FWL_HTHREAD;

+

 class IFWL_Thread {

  public:

-  static IFWL_Thread* Create();

+  // These call into polymorphic methods in the impl; no need to override.

+  void Release();

+  FWL_ERR Run(FWL_HTHREAD hThread);

+

+  CFWL_ThreadImp* GetImpl() const { return m_pImpl; }

+  void SetImpl(CFWL_ThreadImp* pImpl) { m_pImpl = pImpl; }

 

  protected:

   virtual ~IFWL_Thread() {}

 

- public:

-  virtual void Release() = 0;

-  virtual FWL_ERR Run(FWL_HTHREAD hThread) = 0;

+ private:

+  CFWL_ThreadImp* m_pImpl;

 };

-FWL_HTHREAD FWL_StartThread(IFWL_Thread* pThread, FX_BOOL bSuspended = FALSE);

-FWL_ERR FWL_ResumeThread(FWL_HTHREAD hThread);

-FWL_ERR FWL_SuspendThread(FWL_HTHREAD hThread);

-FWL_ERR FWL_KillThread(FWL_HTHREAD hThread, int32_t iExitCode);

-FWL_ERR FWL_StopThread(FWL_HTHREAD hThread, int32_t iExitCode);

-FWL_ERR FWL_Sleep(FX_DWORD dwMilliseconds);

+

 class IFWL_NoteThread : public IFWL_Thread {

  public:

-  static IFWL_NoteThread* Create();

-  virtual FWL_ERR Run(FWL_HTHREAD hThread) = 0;

-  virtual IFWL_NoteDriver* GetNoteDriver() = 0;

+  IFWL_NoteDriver* GetNoteDriver();

 };

-typedef struct _FWL_HMUTEX { void* pData; } * FWL_HMUTEX;

-FWL_HMUTEX FWL_CreateMutex();

-FWL_ERR FWL_DestroyMutex(FWL_HMUTEX hMutex);

-FWL_ERR FWL_LockMutex(FWL_HMUTEX hMutex);

-FWL_ERR FWL_TryLockMutex(FWL_HMUTEX hMutex);

-FWL_ERR FWL_UnlockMutex(FWL_HMUTEX hMutex);

-FWL_ERR FWL_IsLockedMutex(FWL_HMUTEX hMutex, FX_BOOL& bLocked);

-typedef struct _FWL_HSEMAPHORE { void* pData; } * FWL_HSEMAPHORE;

-FWL_HSEMAPHORE FWL_CreateSemaphore();

-FWL_ERR FWL_DestroySemaphore(FWL_HSEMAPHORE hSemaphore);

-FWL_ERR FWL_WaitSemaphore(FWL_HSEMAPHORE hSemaphore);

-FWL_ERR FWL_PostSemaphore(FWL_HSEMAPHORE hSemaphore, int32_t down = 1);

-FWL_ERR FWL_GetSemaphoreValue(FWL_HSEMAPHORE hSemaphore, int32_t& value);

-FWL_ERR FWL_ResetSemaphore(FWL_HSEMAPHORE hSemaphore, int32_t init);

-#endif

+

+#endif  // FWL_THREAD_H_

diff --git a/xfa/include/fwl/lightwidget/app.h b/xfa/include/fwl/lightwidget/app.h
index 367e732f5c..053bc61c99 100644
--- a/xfa/include/fwl/lightwidget/app.h
+++ b/xfa/include/fwl/lightwidget/app.h
@@ -4,22 +4,25 @@
 

 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

 

-#ifndef _FWL_APP_LIGHT_H

-#define _FWL_APP_LIGHT_H

+#ifndef FWL_LIGHTWIDGET_APP_H_

+#define FWL_LIGHTWIDGET_APP_H_

+

 class CFWL_Theme;

 class IFWL_App;

-class CFWL_App;

+

 class CFWL_App {

  public:

   CFWL_App();

   virtual ~CFWL_App();

+

   FWL_ERR Initialize();

-  CFWL_Theme* GetTheme();

-  FWL_ERR Exit(int32_t iExitCode = 0);

-  IFWL_App* GetApp();

+  FWL_ERR Exit(int32_t iExitCode);

+

+  CFWL_Theme* GetTheme() const { return m_pTheme; }

+  IFWL_App* GetInterface() const { return m_pIface; }

 

- protected:

-  IFWL_App* m_pAppImp;

-  CFWL_Theme* m_pThemeProvider;

+ private:

+  IFWL_App* m_pIface;

+  CFWL_Theme* m_pTheme;

 };

-#endif

+#endif  // FWL_LIGHTWIDGET_APP_H_

diff --git a/xfa/include/fwl/lightwidget/theme.h b/xfa/include/fwl/lightwidget/theme.h
index f5945f377d..c58f043a36 100644
--- a/xfa/include/fwl/lightwidget/theme.h
+++ b/xfa/include/fwl/lightwidget/theme.h
@@ -6,35 +6,38 @@
 

 #ifndef _FWL_THEME_LIGHT_H

 #define _FWL_THEME_LIGHT_H

-class CFWL_ThemeBackground;

-class CFWL_ThemeText;

-class CFWL_ThemePart;

+

+#include "xfa/include/fwl/core/fwl_theme.h"

+

 class CFWL_WidgetTP;

 class IFWL_Widget;

-class CFWL_Theme;

-class CFWL_Theme {

+

+class CFWL_Theme : public IFWL_ThemeProvider {

  public:

-  virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);

-  virtual FX_DWORD GetThemeID(IFWL_Widget* pWidget);

-  virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget,

-                              FX_DWORD dwThemeID,

-                              FX_BOOL bChildren = TRUE);

-  virtual FWL_ERR GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix);

-  virtual FWL_ERR SetThemeMatrix(IFWL_Widget* pWidget,

-                                 const CFX_Matrix& matrix);

-  virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);

-  virtual FX_BOOL DrawText(CFWL_ThemeText* pParams);

-  virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity);

-  virtual FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget);

-  virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart);

-  virtual FX_BOOL IsInPart(CFWL_ThemePart* pThemePart,

-                           FX_FLOAT fx,

-                           FX_FLOAT fy);

-  virtual FX_BOOL CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect);

-  virtual FWL_ERR Initialize();

-  virtual FWL_ERR Finalize();

   CFWL_Theme();

-  virtual ~CFWL_Theme();

+  ~CFWL_Theme() override;

+

+  // IFWL_ThemeProvider:

+  FX_BOOL IsValidWidget(IFWL_Widget* pWidget) override;

+  FX_DWORD GetThemeID(IFWL_Widget* pWidget) override;

+  FX_DWORD SetThemeID(IFWL_Widget* pWidget,

+                      FX_DWORD dwThemeID,

+                      FX_BOOL bChildren = TRUE) override;

+  FWL_ERR GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix) override;

+  FWL_ERR SetThemeMatrix(IFWL_Widget* pWidget,

+                         const CFX_Matrix& matrix) override;

+  FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams) override;

+  FX_BOOL DrawText(CFWL_ThemeText* pParams) override;

+  void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity) override;

+  FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget) override;

+  FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart) override;

+  FX_BOOL IsInPart(CFWL_ThemePart* pThemePart,

+                   FX_FLOAT fx,

+                   FX_FLOAT fy) override;

+  FX_BOOL CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) override;

+

+  FWL_ERR Initialize();

+  FWL_ERR Finalize();

   FWL_ERR SetFont(IFWL_Widget* pWidget,

                   const FX_WCHAR* strFont,

                   FX_FLOAT fFontSize,