Remove unused Thread class and static members.

R=thestig@chromium.org

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

2 files changed, 4 insertions, 24 deletions

diff --git a/xfa/src/fwl/src/core/fwl_threadimp.cpp b/xfa/src/fwl/src/core/fwl_threadimp.cpp
index 9a298be394..546f14ad74 100644
--- a/xfa/src/fwl/src/core/fwl_threadimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_threadimp.cpp
@@ -9,11 +9,6 @@
 #include "include/fwl_noteimp.h"

 #include "include/fwl_threadimp.h"

 #include "include/fwl_appimp.h"

-CFWL_ControlThread::~CFWL_ControlThread() {}

-FWL_ERR CFWL_ControlThread::Run(FWL_HTHREAD hThread) {

-  FXSYS_assert(false);

-  return FWL_ERR_Succeeded;

-}

 IFWL_Thread* IFWL_Thread::Create() {

   return (IFWL_Thread*)new CFWL_Thread;

 }

@@ -22,9 +17,6 @@ CFWL_Thread::~CFWL_Thread() {}
 FWL_ERR CFWL_Thread::Run(FWL_HTHREAD hThread) {

   return FWL_ERR_Succeeded;

 }

-CFWL_ControlThread* CFWL_NoteThread::_assistantThreadHandler = NULL;

-FWL_HTHREAD CFWL_NoteThread::_assistantThread = NULL;

-int32_t CFWL_NoteThread::_refCount = 0;

 IFWL_NoteThread* IFWL_NoteThread::Create() {

   return (IFWL_NoteThread*)new CFWL_NoteThread;

 }

diff --git a/xfa/src/fwl/src/core/include/fwl_threadimp.h b/xfa/src/fwl/src/core/include/fwl_threadimp.h
index a8e156d1b3..eb3331f451 100644
--- a/xfa/src/fwl/src/core/include/fwl_threadimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_threadimp.h
@@ -6,13 +6,12 @@
 

 #ifndef _FWL_THREAD_IMP_H

 #define _FWL_THREAD_IMP_H

-class CFWL_TargetImp;

+

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

+

 class CFWL_NoteDriver;

-class IFWL_NoteThread;

 class IFWL_NoteDriver;

-class CFWL_Thread;

-class CFWL_NoteThread;

-class CFWL_ControlThread;

+

 class CFWL_Thread {

  public:

   CFWL_Thread();

@@ -20,15 +19,7 @@ class CFWL_Thread {
   virtual void Release() { delete this; }

   virtual FWL_ERR Run(FWL_HTHREAD hThread);

 };

-class CFWL_ControlThread : public CFWL_Thread {

- public:

-  CFWL_ControlThread(IFWL_Thread* defHandler) { _defHandler = defHandler; }

-  virtual ~CFWL_ControlThread();

-  virtual FWL_ERR Run(FWL_HTHREAD hThread);

 

- protected:

-  IFWL_Thread* _defHandler;

-};

 class CFWL_NoteThread : public CFWL_Thread {

  public:

   CFWL_NoteThread();

@@ -39,8 +30,5 @@ class CFWL_NoteThread : public CFWL_Thread {
  protected:

   CFWL_NoteDriver* m_pNoteDriver;

   FWL_HTHREAD m_hThread;

-  static CFWL_ControlThread* _assistantThreadHandler;

-  static FWL_HTHREAD _assistantThread;

-  static int32_t _refCount;

 };

 #endif