From abdf7e101fbfbe4a19aa7e5d6519891126c7cb21 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 1 Jun 2018 18:19:23 +0000 Subject: Rename CPDFXFA_Context::GetTimerMgr() to NewTimerMgr() Because it returns an unique_ptr to a newly-created object. Also rename m_pTimeMgrAdapter to m_pAdapterTimerMgr, because in English, adjectives come first, and this is a TimerMgr obtained from an Adatper, not an Adapter for a TimerMgr. Also change TimeMgr to TimerMgr since the manager manages timers, not time itself. Follow-on from https://pdfium-review.googlesource.com/c/pdfium/+/33230 No functional change. Change-Id: I08d2b6cd8cc816f38326e87ee46060f091c74fdf Reviewed-on: https://pdfium-review.googlesource.com/33570 Reviewed-by: Ryan Harrison Commit-Queue: Ryan Harrison --- xfa/fwl/cfwl_timer.cpp | 8 ++++---- xfa/fwl/cfwl_timer.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fwl') diff --git a/xfa/fwl/cfwl_timer.cpp b/xfa/fwl/cfwl_timer.cpp index 07d8461b9f..b7c54fdab1 100644 --- a/xfa/fwl/cfwl_timer.cpp +++ b/xfa/fwl/cfwl_timer.cpp @@ -25,13 +25,13 @@ CFWL_TimerInfo* CFWL_Timer::StartTimer(uint32_t dwElapse, bool bImmediately) { if (!pAdapterNative) return nullptr; - if (!m_pTimeMgrAdapter) - m_pTimeMgrAdapter = pAdapterNative->GetTimerMgr(); + if (!m_pAdapterTimerMgr) + m_pAdapterTimerMgr = pAdapterNative->NewTimerMgr(); - if (!m_pTimeMgrAdapter) + if (!m_pAdapterTimerMgr) return nullptr; CFWL_TimerInfo* pTimerInfo = nullptr; - m_pTimeMgrAdapter->Start(this, dwElapse, bImmediately, &pTimerInfo); + m_pAdapterTimerMgr->Start(this, dwElapse, bImmediately, &pTimerInfo); return pTimerInfo; } diff --git a/xfa/fwl/cfwl_timer.h b/xfa/fwl/cfwl_timer.h index 355ea69d67..586c2f3e40 100644 --- a/xfa/fwl/cfwl_timer.h +++ b/xfa/fwl/cfwl_timer.h @@ -26,7 +26,7 @@ class CFWL_Timer { protected: UnownedPtr m_pWidget; - std::unique_ptr m_pTimeMgrAdapter; + std::unique_ptr m_pAdapterTimerMgr; }; #endif // XFA_FWL_CFWL_TIMER_H_ -- cgit v1.2.3