From 55fa356c8ce72c597e75fc591fc67597b1c019d5 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 4 May 2016 14:24:53 -0700 Subject: Cleanup IFWL_Adapter interfaces. This CL removes: * IFWL_AdapterNative * IFWL_Adapter{Widget|Thread}Mgr * IFWL_WidgetMgrDelegate * CFWL_SDAdapter{Widget|Thread}Mgr Methods which just returned have also been removed. Review-Url: https://codereview.chromium.org/1928963004 --- xfa/fwl/basewidget/fwl_caretimp.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'xfa/fwl/basewidget/fwl_caretimp.cpp') diff --git a/xfa/fwl/basewidget/fwl_caretimp.cpp b/xfa/fwl/basewidget/fwl_caretimp.cpp index c61c459f2e..23a5213a4d 100644 --- a/xfa/fwl/basewidget/fwl_caretimp.cpp +++ b/xfa/fwl/basewidget/fwl_caretimp.cpp @@ -22,8 +22,8 @@ IFWL_Caret* IFWL_Caret::Create(const CFWL_WidgetImpProperties& properties, return pCaret; } IFWL_Caret::IFWL_Caret() {} -FWL_ERR IFWL_Caret::ShowCaret(FX_BOOL bFlag) { - return static_cast(GetImpl())->ShowCaret(bFlag); +void IFWL_Caret::ShowCaret(FX_BOOL bFlag) { + static_cast(GetImpl())->ShowCaret(bFlag); } FWL_ERR IFWL_Caret::GetFrequency(uint32_t& elapse) { return static_cast(GetImpl())->GetFrequency(elapse); @@ -82,15 +82,16 @@ FWL_ERR CFWL_CaretImp::DrawWidget(CFX_Graphics* pGraphics, DrawCaretBK(pGraphics, m_pProperties->m_pThemeProvider, pMatrix); return FWL_ERR_Succeeded; } -FWL_ERR CFWL_CaretImp::ShowCaret(FX_BOOL bFlag) { + +void CFWL_CaretImp::ShowCaret(FX_BOOL bFlag) { if (m_hTimer) { FWL_StopTimer(m_hTimer); - m_hTimer = NULL; + m_hTimer = nullptr; } - if (bFlag) { + if (bFlag) m_hTimer = FWL_StartTimer(m_pTimer, m_dwElapse); - } - return SetStates(FWL_WGTSTATE_Invisible, !bFlag); + + SetStates(FWL_WGTSTATE_Invisible, !bFlag); } FWL_ERR CFWL_CaretImp::GetFrequency(uint32_t& elapse) { elapse = m_dwElapse; -- cgit v1.2.3