Fold the FWL NoteThread classes up to the Thread classes.

xfa/fwl/core/ifwl_thread.h

Index: xfa/fwl/core/ifwl_thread.h
diff --git a/xfa/fwl/core/ifwl_thread.h b/xfa/fwl/core/ifwl_thread.h
index d05aa6da0c457814808afe697b644d42a14da78b..b1314033e21dc57bed210df68b388f78acf2dbae 100644
--- a/xfa/fwl/core/ifwl_thread.h
+++ b/xfa/fwl/core/ifwl_thread.h
@@ -14,10 +14,6 @@
 //      (nonesuch)              IFWL_Thread ----------> CFWL_ThreadImp
 //                                   |      <----------      |
 //                                   A       m_pIface        A
-//                                   |                       |
-//      (nonesuch)              IFWL_NoteThread         CFWL_NoteThreadImp
-//                                   |                       |
-//                                   A                       A
 //                m_pIface           |                       |
 //      CFWL_App --------------> IFWL_App                CFWL_AppImp
 //
@@ -35,6 +31,8 @@ class IFWL_Thread {
   CFWL_ThreadImp* GetImpl() const { return m_pImpl; }
   void SetImpl(CFWL_ThreadImp* pImpl) { m_pImpl = pImpl; }
 
+  IFWL_NoteDriver* GetNoteDriver();

[Tom Sepez, 2016/04/13 21:45:29]

is this a const method?

[dsinclair, 2016/04/14 13:23:35]

Looks like it can be. Done.

+
  protected:
   virtual ~IFWL_Thread() {}