Fold the FWL NoteThread classes up to the Thread classes.

xfa/fwl/core/ifwl_widget.h

 // 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
 
 #ifndef XFA_FWL_CORE_IFWL_WIDGET_H_
 #define XFA_FWL_CORE_IFWL_WIDGET_H_
 
-#include "xfa/fwl/core/fwl_error.h"
+#include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_system.h"
-#include "core/fxcrt/include/fx_basic.h"
+#include "xfa/fwl/core/fwl_error.h"
 #include "xfa/fwl/core/ifwl_target.h"
 
 class CFX_Graphics;
 class IFWL_DataProvider;
 class IFWL_Form;
-class IFWL_NoteThread;
+class IFWL_Thread;
 class IFWL_ThemeProvider;
 class IFWL_WidgetDelegate;
 
 class IFWL_Widget : public IFWL_Target {
  public:
   FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
   FWL_ERR GetGlobalRect(CFX_RectF& rect);
   FWL_ERR SetWidgetRect(const CFX_RectF& rect);
   FWL_ERR GetClientRect(CFX_RectF& rect);
   IFWL_Widget* GetParent();
@@ skipping 17 matching lines @@
   uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy);
   FWL_ERR TransformTo(IFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy);
   FWL_ERR TransformTo(IFWL_Widget* pWidget, CFX_RectF& rt);
   FWL_ERR GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE);
   FWL_ERR SetMatrix(const CFX_Matrix& matrix);
   FWL_ERR DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = NULL);
   IFWL_ThemeProvider* GetThemeProvider();
   FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider);
   FWL_ERR SetDataProvider(IFWL_DataProvider* pDataProvider);
   IFWL_WidgetDelegate* SetDelegate(IFWL_WidgetDelegate* pDelegate);
-  IFWL_NoteThread* GetOwnerThread() const;
+  IFWL_Thread* GetOwnerThread() const;
   CFX_SizeF GetOffsetFromParent(IFWL_Widget* pParent);
 };
 
 #endif  // XFA_FWL_CORE_IFWL_WIDGET_H_