diff options
| author | Tom Sepez <tsepez@chromium.org> | 2018-06-01 18:19:23 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-06-01 18:19:23 +0000 |
| commit | abdf7e101fbfbe4a19aa7e5d6519891126c7cb21 (patch) | |
| tree | 15c2508f769a053ef11f2efc113ee766fa4e0c5c /xfa | |
| parent | 83a5063e117968b92bf96ba0fd2701f6c78e40a4 (diff) | |
| download | pdfium-abdf7e101fbfbe4a19aa7e5d6519891126c7cb21.tar.xz | |
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 <rharrison@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'xfa')
| -rw-r--r-- | xfa/fwl/cfwl_timer.cpp | 8 | ||||
| -rw-r--r-- | xfa/fwl/cfwl_timer.h | 2 | ||||
| -rw-r--r-- | xfa/fxfa/cxfa_ffapp.cpp | 4 | ||||
| -rw-r--r-- | xfa/fxfa/cxfa_ffapp.h | 2 | ||||
| -rw-r--r-- | xfa/fxfa/fxfa.h | 2 |
5 files changed, 9 insertions, 9 deletions
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<CFWL_Widget> m_pWidget; - std::unique_ptr<IFWL_AdapterTimerMgr> m_pTimeMgrAdapter; + std::unique_ptr<IFWL_AdapterTimerMgr> m_pAdapterTimerMgr; }; #endif // XFA_FWL_CFWL_TIMER_H_ diff --git a/xfa/fxfa/cxfa_ffapp.cpp b/xfa/fxfa/cxfa_ffapp.cpp index f6d6bdd6b5..21b2eddbb4 100644 --- a/xfa/fxfa/cxfa_ffapp.cpp +++ b/xfa/fxfa/cxfa_ffapp.cpp @@ -67,8 +67,8 @@ CXFA_FWLAdapterWidgetMgr* CXFA_FFApp::GetFWLAdapterWidgetMgr() { return m_pAdapterWidgetMgr.get(); } -std::unique_ptr<IFWL_AdapterTimerMgr> CXFA_FFApp::GetTimerMgr() const { - return m_pProvider->GetTimerMgr(); +std::unique_ptr<IFWL_AdapterTimerMgr> CXFA_FFApp::NewTimerMgr() const { + return m_pProvider->NewTimerMgr(); } void CXFA_FFApp::ClearEventTargets() { diff --git a/xfa/fxfa/cxfa_ffapp.h b/xfa/fxfa/cxfa_ffapp.h index acc3bf0783..20db6e06a3 100644 --- a/xfa/fxfa/cxfa_ffapp.h +++ b/xfa/fxfa/cxfa_ffapp.h @@ -45,7 +45,7 @@ class CXFA_FFApp { IXFA_AppProvider* GetAppProvider() const { return m_pProvider.Get(); } const CFWL_App* GetFWLApp() const { return m_pFWLApp.get(); } CXFA_FontMgr* GetXFAFontMgr() { return &m_pFontMgr; } - std::unique_ptr<IFWL_AdapterTimerMgr> GetTimerMgr() const; + std::unique_ptr<IFWL_AdapterTimerMgr> NewTimerMgr() const; void ClearEventTargets(); diff --git a/xfa/fxfa/fxfa.h b/xfa/fxfa/fxfa.h index 59c8c08de8..1b0c76f584 100644 --- a/xfa/fxfa/fxfa.h +++ b/xfa/fxfa/fxfa.h @@ -202,7 +202,7 @@ class IXFA_AppProvider { const WideString& wsData, const WideString& wsEncode) = 0; - virtual std::unique_ptr<IFWL_AdapterTimerMgr> GetTimerMgr() = 0; + virtual std::unique_ptr<IFWL_AdapterTimerMgr> NewTimerMgr() = 0; }; class IXFA_DocEnvironment { |