From 47228aceb86744f858ab8bfa98f3f8b62054dfae Mon Sep 17 00:00:00 2001 From: weili Date: Wed, 20 Jul 2016 10:35:31 -0700 Subject: Clean up singleton implementation Move the singleton instances into their namespaces, and use get()/getInstance() for uniform accesses. Review-Url: https://codereview.chromium.org/2154843002 --- core/fpdfapi/cpdf_modulemgr.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'core/fpdfapi') diff --git a/core/fpdfapi/cpdf_modulemgr.cpp b/core/fpdfapi/cpdf_modulemgr.cpp index fe5368d3f7..454ffcd465 100644 --- a/core/fpdfapi/cpdf_modulemgr.cpp +++ b/core/fpdfapi/cpdf_modulemgr.cpp @@ -11,25 +11,21 @@ namespace { -CPDF_ModuleMgr* g_FPDFAPI_pDefaultMgr = nullptr; +CPDF_ModuleMgr* g_pDefaultMgr = nullptr; } // namespace // static CPDF_ModuleMgr* CPDF_ModuleMgr::Get() { - return g_FPDFAPI_pDefaultMgr; -} - -// static -void CPDF_ModuleMgr::Create() { - ASSERT(!g_FPDFAPI_pDefaultMgr); - g_FPDFAPI_pDefaultMgr = new CPDF_ModuleMgr; + if (!g_pDefaultMgr) + g_pDefaultMgr = new CPDF_ModuleMgr; + return g_pDefaultMgr; } // static void CPDF_ModuleMgr::Destroy() { - delete g_FPDFAPI_pDefaultMgr; - g_FPDFAPI_pDefaultMgr = nullptr; + delete g_pDefaultMgr; + g_pDefaultMgr = nullptr; } CPDF_ModuleMgr::CPDF_ModuleMgr() : m_pCodecModule(nullptr) {} -- cgit v1.2.3