From 7adef41ed27ced7e18ee649a3d4f27a3cc00c51f Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 18 Apr 2016 06:49:02 -0700 Subject: Fold the FWL NoteThread classes up to the Thread classes. The NoteThread classes only contained one member and don't provide any added clarity. This CL moves the NoteDriver up to the Thread classes and removes the NoteThread classes. Review URL: https://codereview.chromium.org/1887703003 --- xfa/fwl/lightwidget/cfwl_widget.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fwl/lightwidget') diff --git a/xfa/fwl/lightwidget/cfwl_widget.cpp b/xfa/fwl/lightwidget/cfwl_widget.cpp index 1f4512e381..071940fe36 100644 --- a/xfa/fwl/lightwidget/cfwl_widget.cpp +++ b/xfa/fwl/lightwidget/cfwl_widget.cpp @@ -13,8 +13,8 @@ #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; @@ -242,7 +242,7 @@ FWL_ERR CFWL_Widget::Repaint(const CFX_RectF* pRect) { 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(); @@ -261,7 +261,7 @@ FWL_ERR CFWL_Widget::SetFocus(FX_BOOL bFocus) { 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(); @@ -275,7 +275,7 @@ 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(); @@ -292,7 +292,7 @@ void CFWL_Widget::DispatchEvent(CFWL_Event* pEvent) { 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(); -- cgit v1.2.3