2 files changed, 14 insertions, 47 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_