Fold the FWL NoteThread classes up to the Thread classes.

xfa/fwl/lightwidget/cfwl_widget.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/lightwidget/cfwl_widget.h"
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/core/cfwl_themetext.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/fwl_targetimp.h"
 #include "xfa/fwl/core/fwl_widgetimp.h"
 #include "xfa/fwl/core/fwl_widgetmgrimp.h"
-#include "xfa/fwl/core/ifwl_notethread.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/core/ifwl_thread.h"
 
 IFWL_Widget* CFWL_Widget::GetWidget() {
   return m_pIface;
 }
 
 FWL_ERR CFWL_Widget::GetClassName(CFX_WideString& wsClass) const {
   if (!m_pIface)
     return FWL_ERR_Indefinite;
   return m_pIface->GetClassName(wsClass);
 }
@@ skipping 207 matching lines @@
   } else {
     m_pIface->GetWidgetRect(rect);
     rect.left = rect.top = 0;
   }
   return m_pWidgetMgr->RepaintWidget(m_pIface, &rect);
 }
 
 FWL_ERR CFWL_Widget::SetFocus(FX_BOOL bFocus) {
   if (!m_pIface)
     return FWL_ERR_Indefinite;
-  IFWL_NoteThread* pThread = m_pIface->GetOwnerThread();
+  IFWL_Thread* pThread = m_pIface->GetOwnerThread();
   if (!pThread)
     return FWL_ERR_Indefinite;
   IFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
   if (!pDriver)
     return FWL_ERR_Indefinite;
   if (bFocus) {
     pDriver->SetFocus(m_pIface);
   } else {
     if (pDriver->GetFocus() == m_pIface) {
       pDriver->SetFocus(NULL);
     }
   }
   return FWL_ERR_Succeeded;
 }
 
 FWL_ERR CFWL_Widget::SetGrab(FX_BOOL bSet) {
   if (!m_pIface)
     return FWL_ERR_Indefinite;
-  IFWL_NoteThread* pThread = m_pIface->GetOwnerThread();
+  IFWL_Thread* pThread = m_pIface->GetOwnerThread();
   if (!pThread)
     return FWL_ERR_Indefinite;
   IFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
   if (!pDriver)
     return FWL_ERR_Indefinite;
   pDriver->SetGrab(m_pIface, bSet);
   return FWL_ERR_Succeeded;
 }
 
 void CFWL_Widget::RegisterEventTarget(CFWL_Widget* pEventSource,
                                       uint32_t dwFilter) {
   if (!m_pIface)
     return;
-  IFWL_NoteThread* pThread = m_pIface->GetOwnerThread();
+  IFWL_Thread* pThread = m_pIface->GetOwnerThread();
   if (!pThread)
     return;
   IFWL_NoteDriver* pNoteDriver = pThread->GetNoteDriver();
   if (!pNoteDriver)
     return;
   IFWL_Widget* pEventSourceImp =
       !pEventSource ? NULL : pEventSource->GetWidget();
   pNoteDriver->RegisterEventTarget(GetWidget(), pEventSourceImp, dwFilter);
 }
 
 void CFWL_Widget::DispatchEvent(CFWL_Event* pEvent) {
   if (!m_pIface)
     return;
   if (m_pIface->GetOuter()) {
     return;
   }
-  IFWL_NoteThread* pThread = m_pIface->GetOwnerThread();
+  IFWL_Thread* pThread = m_pIface->GetOwnerThread();
   if (!pThread)
     return;
   IFWL_NoteDriver* pNoteDriver = pThread->GetNoteDriver();
   if (!pNoteDriver)
     return;
   pNoteDriver->SendNote(pEvent);
 }
 
 #define FWL_WGT_CalcHeight 2048
 #define FWL_WGT_CalcWidth 2048
@@ skipping 16 matching lines @@
   calPart.m_iTTOAlign = FDE_TTOALIGNMENT_TopLeft;
   CFX_RectF rect;
   FX_FLOAT fWidth = bMultiLine
                         ? (iLineWidth > 0 ? (FX_FLOAT)iLineWidth
                                           : FWL_WGT_CalcMultiLineDefWidth)
                         : FWL_WGT_CalcWidth;
   rect.Set(0, 0, fWidth, FWL_WGT_CalcHeight);
   pTheme->CalcTextRect(&calPart, rect);
   return CFX_SizeF(rect.width, rect.height);
 }