Rename CFWL_Thread classes to ThreadImp

This matches the 3-level parallel hierarchy convention
used elsewhere in FWL.  Remove dead code along the way.

R=thestig@chromium.org

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

9 files changed, 51 insertions, 180 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_thread.h b/xfa/include/fwl/core/fwl_thread.h
index 3bc5c3c289..f8ea2aa104 100644
--- a/xfa/include/fwl/core/fwl_thread.h
+++ b/xfa/include/fwl/core/fwl_thread.h
@@ -4,47 +4,25 @@
 

 // 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_

+

 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();

+  virtual void Release() = 0;

+  virtual FWL_ERR Run(FWL_HTHREAD hThread) = 0;

 

  protected:

   virtual ~IFWL_Thread() {}

-

- public:

-  virtual void Release() = 0;

-  virtual FWL_ERR Run(FWL_HTHREAD hThread) = 0;

 };

-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;

 };

-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/src/fwl/src/core/fwl_threadimp.cpp b/xfa/src/fwl/src/core/fwl_threadimp.cpp
index 546f14ad74..2972b2349c 100644
--- a/xfa/src/fwl/src/core/fwl_threadimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_threadimp.cpp
@@ -9,119 +9,22 @@
 #include "include/fwl_noteimp.h"

 #include "include/fwl_threadimp.h"

 #include "include/fwl_appimp.h"

-IFWL_Thread* IFWL_Thread::Create() {

-  return (IFWL_Thread*)new CFWL_Thread;

-}

-CFWL_Thread::CFWL_Thread() {}

-CFWL_Thread::~CFWL_Thread() {}

-FWL_ERR CFWL_Thread::Run(FWL_HTHREAD hThread) {

+CFWL_ThreadImp::CFWL_ThreadImp() {}

+CFWL_ThreadImp::~CFWL_ThreadImp() {}

+FWL_ERR CFWL_ThreadImp::Run(FWL_HTHREAD hThread) {

   return FWL_ERR_Succeeded;

 }

-IFWL_NoteThread* IFWL_NoteThread::Create() {

-  return (IFWL_NoteThread*)new CFWL_NoteThread;

-}

-CFWL_NoteThread::CFWL_NoteThread() : m_hThread(NULL) {

+CFWL_NoteThreadImp::CFWL_NoteThreadImp() {

   m_pNoteDriver = new CFWL_NoteDriver;

 }

-CFWL_NoteThread::~CFWL_NoteThread() {

-  if (m_hThread) {

-    FWL_StopThread(m_hThread, 0);

-  }

-  if (m_pNoteDriver) {

-    delete m_pNoteDriver;

-    m_pNoteDriver = NULL;

-  }

+CFWL_NoteThreadImp::~CFWL_NoteThreadImp() {

+  delete m_pNoteDriver;

 }

-FWL_ERR CFWL_NoteThread::Run(FWL_HTHREAD hThread) {

+FWL_ERR CFWL_NoteThreadImp::Run(FWL_HTHREAD hThread) {

   if (!m_pNoteDriver)

     return FWL_ERR_Indefinite;

-  FWL_ERR result = m_pNoteDriver->Run();

-  return result;

+  return m_pNoteDriver->Run();

 }

-IFWL_NoteDriver* CFWL_NoteThread::GetNoteDriver() {

+IFWL_NoteDriver* CFWL_NoteThreadImp::GetNoteDriver() {

   return (IFWL_NoteDriver*)m_pNoteDriver;

 }

-extern IFWL_AdapterNative* FWL_GetAdapterNative();

-FWL_HTHREAD FWL_StartThread(IFWL_Thread* pThread, FX_BOOL bSuspended) {

-  IFWL_AdapterNative* pNative = FWL_GetAdapterNative();

-  if (!pNative)

-    return NULL;

-  IFWL_AdapterThreadMgr* pThreadMgr = pNative->GetThreadMgr();

-  if (!pThreadMgr)

-    return NULL;

-  FWL_HTHREAD hThread = NULL;

-  pThreadMgr->Start(pThread, hThread, bSuspended);

-  return hThread;

-}

-FWL_ERR FWL_ResumeThread(FWL_HTHREAD hThread) {

-  IFWL_AdapterNative* Native = FWL_GetAdapterNative();

-  if (!Native)

-    return FWL_ERR_Indefinite;

-  IFWL_AdapterThreadMgr* ThreadMgr = Native->GetThreadMgr();

-  if (!ThreadMgr)

-    return FWL_ERR_Indefinite;

-  return ThreadMgr->Resume(hThread);

-}

-FWL_ERR FWL_SuspendThread(FWL_HTHREAD hThread) {

-  IFWL_AdapterNative* Native = FWL_GetAdapterNative();

-  if (!Native)

-    return FWL_ERR_Indefinite;

-  IFWL_AdapterThreadMgr* ThreadMgr = Native->GetThreadMgr();

-  if (!ThreadMgr)

-    return FWL_ERR_Indefinite;

-  return ThreadMgr->Suspend(hThread);

-}

-FWL_ERR FWL_KillThread(FWL_HTHREAD hThread, int32_t iExitCode) {

-  IFWL_AdapterNative* Native = FWL_GetAdapterNative();

-  if (!Native)

-    return FWL_ERR_Indefinite;

-  IFWL_AdapterThreadMgr* ThreadMgr = Native->GetThreadMgr();

-  if (!ThreadMgr)

-    return FWL_ERR_Indefinite;

-  return ThreadMgr->Kill(hThread, iExitCode);

-}

-FWL_ERR FWL_StopThread(FWL_HTHREAD hThread, int32_t iExitCode) {

-  IFWL_AdapterNative* Native = FWL_GetAdapterNative();

-  if (!Native)

-    return FWL_ERR_Indefinite;

-  IFWL_AdapterThreadMgr* ThreadMgr = Native->GetThreadMgr();

-  if (!ThreadMgr)

-    return FWL_ERR_Indefinite;

-  return ThreadMgr->Stop(hThread, iExitCode);

-}

-FWL_HMUTEX FWL_CreateMutex() {

-  return NULL;

-}

-FWL_ERR FWL_DestroyMutex(FWL_HMUTEX hMutex) {

-  return FWL_ERR_Succeeded;

-}

-FWL_ERR FWL_LockMutex(FWL_HMUTEX hMutex) {

-  return FWL_ERR_Succeeded;

-}

-FWL_ERR FWL_TryLockMutex(FWL_HMUTEX hMutex) {

-  return FWL_ERR_Succeeded;

-}

-FWL_ERR FWL_UnlockMutex(FWL_HMUTEX hMutex) {

-  return FWL_ERR_Succeeded;

-}

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

-  return FWL_ERR_Succeeded;

-}

-FWL_HSEMAPHORE FWL_CreateSemaphore() {

-  return (FWL_HSEMAPHORE)IFWL_AdapterSemaphore::Create();

-}

-FWL_ERR FWL_DestroySemaphore(FWL_HSEMAPHORE hSemaphore) {

-  return ((IFWL_AdapterSemaphore*)hSemaphore)->Destroy();

-}

-FWL_ERR FWL_WaitSemaphore(FWL_HSEMAPHORE hSemaphore) {

-  return ((IFWL_AdapterSemaphore*)hSemaphore)->Wait();

-}

-FWL_ERR FWL_PostSemaphore(FWL_HSEMAPHORE hSemaphore, int32_t down) {

-  return ((IFWL_AdapterSemaphore*)hSemaphore)->Post();

-}

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

-  return ((IFWL_AdapterSemaphore*)hSemaphore)->Value((FX_DWORD&)value);

-}

-FWL_ERR FWL_ResetSemaphore(FWL_HSEMAPHORE hSemaphore, int32_t init) {

-  return ((IFWL_AdapterSemaphore*)hSemaphore)->Reset(init);

-}

diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp
index 2e6d5b30ed..135a3e1b80 100644
--- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp
@@ -131,7 +131,7 @@ FWL_ERR CFWL_WidgetImp::Initialize() {
   IFWL_AdapterThreadMgr* pAdapterThread = pAdapter->GetThreadMgr();

   if (!pAdapterThread)

     return FWL_ERR_Indefinite;

-  SetOwnerThread((CFWL_NoteThread*)pAdapterThread->GetCurrentThread());

+  SetOwnerThread((CFWL_NoteThreadImp*)pAdapterThread->GetCurrentThread());

   IFWL_Widget* pParent = m_pProperties->m_pParent;

   m_pWidgetMgr->InsertWidget(pParent, m_pInterface);

   if (!IsChild()) {

@@ -488,7 +488,7 @@ IFWL_WidgetDelegate* CFWL_WidgetImp::SetDelegate(
 IFWL_NoteThread* CFWL_WidgetImp::GetOwnerThread() const {

   return (IFWL_NoteThread*)m_pOwnerThread;

 }

-FWL_ERR CFWL_WidgetImp::SetOwnerThread(CFWL_NoteThread* pOwnerThread) {

+FWL_ERR CFWL_WidgetImp::SetOwnerThread(CFWL_NoteThreadImp* pOwnerThread) {

   m_pOwnerThread = pOwnerThread;

   return FWL_ERR_Succeeded;

 }

diff --git a/xfa/src/fwl/src/core/include/fwl_appimp.h b/xfa/src/fwl/src/core/include/fwl_appimp.h
index ec23febb32..a0a7cc0fe4 100644
--- a/xfa/src/fwl/src/core/include/fwl_appimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_appimp.h
@@ -4,16 +4,18 @@
 

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

 

-#ifndef _FWL_APP_IMP_H

-#define _FWL_APP_IMP_H

-class CFWL_NoteThread;

+#ifndef FWL_APPIMP_H_

+#define FWL_APPIMP_H_

+

+#include "xfa/src/fwl/src/core/include/fwl_threadimp.h"

+

 class CFWL_WidgetMgr;

 class IFWL_AdapterNative;

 class IFWL_WidgetMgr;

 class IFWL_ThemeProvider;

 class IFWL_App;

-class CFWL_AppImp;

-class CFWL_AppImp : public CFWL_NoteThread {

+

+class CFWL_AppImp : public CFWL_NoteThreadImp {

  public:

   CFWL_AppImp(IFWL_AdapterNative* pAdapter);

   virtual ~CFWL_AppImp();

@@ -31,4 +33,5 @@ class CFWL_AppImp : public CFWL_NoteThread {
   IFWL_ThemeProvider* m_pThemeProvider;

   FX_BOOL m_bFuelAdapter;

 };

-#endif

+

+#endif  // FWL_APPIMP_H_

diff --git a/xfa/src/fwl/src/core/include/fwl_noteimp.h b/xfa/src/fwl/src/core/include/fwl_noteimp.h
index 413b0fd034..b846d20263 100644
--- a/xfa/src/fwl/src/core/include/fwl_noteimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_noteimp.h
@@ -8,7 +8,7 @@
 #define _FWL_NOTE_IMP_H

 class CFWL_TargetImp;

 class CFWL_WidgetImp;

-class CFWL_NoteThread;

+class CFWL_NoteThreadImp;

 class CFWL_ToolTipImp;

 class IFWL_ToolTipTarget;

 class CFWL_CoreToopTipDP;

diff --git a/xfa/src/fwl/src/core/include/fwl_threadimp.h b/xfa/src/fwl/src/core/include/fwl_threadimp.h
index eb3331f451..644f6a3678 100644
--- a/xfa/src/fwl/src/core/include/fwl_threadimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_threadimp.h
@@ -4,31 +4,32 @@
 

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

 

-#ifndef _FWL_THREAD_IMP_H

-#define _FWL_THREAD_IMP_H

+#ifndef FWL_THREADIMP_H_

+#define FWL_THREADIMP_H_

 

 #include "xfa/include/fwl/core/fwl_thread.h"  // For FWL_HTHREAD.

 

 class CFWL_NoteDriver;

 class IFWL_NoteDriver;

 

-class CFWL_Thread {

+class CFWL_ThreadImp {

  public:

-  CFWL_Thread();

-  virtual ~CFWL_Thread();

-  virtual void Release() { delete this; }

+  CFWL_ThreadImp();

+  virtual ~CFWL_ThreadImp();

+

   virtual FWL_ERR Run(FWL_HTHREAD hThread);

 };

 

-class CFWL_NoteThread : public CFWL_Thread {

+class CFWL_NoteThreadImp : public CFWL_ThreadImp {

  public:

-  CFWL_NoteThread();

-  virtual ~CFWL_NoteThread();

-  virtual FWL_ERR Run(FWL_HTHREAD hThread);

+  CFWL_NoteThreadImp();

+  virtual ~CFWL_NoteThreadImp();

+

+  FWL_ERR Run(FWL_HTHREAD hThread) override;

   virtual IFWL_NoteDriver* GetNoteDriver();

 

  protected:

   CFWL_NoteDriver* m_pNoteDriver;

-  FWL_HTHREAD m_hThread;

 };

-#endif

+

+#endif  // FWL_THREADIMP_H_

diff --git a/xfa/src/fwl/src/core/include/fwl_widgetimp.h b/xfa/src/fwl/src/core/include/fwl_widgetimp.h
index 949738d6d2..109e575914 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_widgetimp.h
@@ -11,7 +11,7 @@
 #include "xfa/src/fwl/src/core/include/fwl_targetimp.h"

 

 class CFWL_NoteTarget;

-class CFWL_NoteThread;

+class CFWL_NoteThreadImp;

 class CFWL_WidgetImpProperties;

 class CFWL_WidgetMgr;

 class IFWL_DataProvider;

@@ -60,7 +60,7 @@ class CFWL_WidgetImp : public CFWL_TargetImp {
   virtual FWL_ERR SetDataProvider(IFWL_DataProvider* pDataProvider);

   virtual IFWL_WidgetDelegate* SetDelegate(IFWL_WidgetDelegate* pDelegate);

   virtual IFWL_NoteThread* GetOwnerThread() const;

-  FWL_ERR SetOwnerThread(CFWL_NoteThread* pOwnerThread);

+  FWL_ERR SetOwnerThread(CFWL_NoteThreadImp* pOwnerThread);

   IFWL_Widget* GetInterface() const;

   void SetInterface(IFWL_Widget* pInterface);

   CFX_SizeF GetOffsetFromParent(IFWL_Widget* pParent);

@@ -137,7 +137,7 @@ class CFWL_WidgetImp : public CFWL_TargetImp {
 

   FX_BOOL IsParent(IFWL_Widget* pParent);

   CFWL_WidgetMgr* m_pWidgetMgr;

-  CFWL_NoteThread* m_pOwnerThread;

+  CFWL_NoteThreadImp* m_pOwnerThread;

   CFWL_WidgetImpProperties* m_pProperties;

   CFX_PrivateData* m_pPrivateData;

   IFWL_WidgetDelegate* m_pDelegate;

diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp
index 3c9f1a1556..077fa648f3 100644
--- a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp
@@ -15,9 +15,6 @@ IFWL_AdapterNative* FWL_CreateFuelAdapterNative() {
 }

 void FWL_ReleaseFuelAdapterNative(IFWL_AdapterNative* native) {}

 void FWL_PostMessageToMainRoop(CFWL_Message* pMessage) {}

-IFWL_AdapterSemaphore* IFWL_AdapterSemaphore::Create() {

-  return NULL;

-}

 FX_BOOL FWL_ShowCaret(IFWL_Widget* pWidget,

                       FX_BOOL bVisible,

                       const CFX_RectF* pRtAnchor) {