From df685030b73074e46d7eb789e13135c52775091f Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Wed, 9 Dec 2015 11:56:39 -0800
Subject: Re-land "Rename CFWL_Thread classes to ThreadImp"

This reverts commit 5e4f290e939ded90a518ff8eab1db59930655e11.

BUG=
R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1502063005 .
---
 xfa/include/fwl/core/fwl_app.h    | 19 +++++++-----
 xfa/include/fwl/core/fwl_thread.h | 65 ++++++++++++++++++++-------------------
 2 files changed, 45 insertions(+), 39 deletions(-)

(limited to 'xfa/include/fwl/core')

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_
-- 
cgit v1.2.3