diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-26 12:12:19 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-26 17:38:24 +0000 |
| commit | 7d04f1b0ab4848f1d10983b7a7b1444ac93dec70 (patch) | |
| tree | 9d7c2f46195fcb33cadfb90ee32b35ba88c4c134 | |
| parent | 4825c4b7dad8f3118dbad1daf3b4743616b343bd (diff) | |
| download | pdfium-7d04f1b0ab4848f1d10983b7a7b1444ac93dec70.tar.xz | |
Hide FX_HandleParentPath
This CL moves FX_HandleParentPath to be a private inner class of
CFX_FontSourceEnum_File.
Change-Id: I5e2d16c4d78457a28e1833d0b937547019cdece6
Reviewed-on: https://pdfium-review.googlesource.com/14818
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
| -rw-r--r-- | xfa/fgas/font/cfgas_fontmgr.cpp | 4 | ||||
| -rw-r--r-- | xfa/fgas/font/cfgas_fontmgr.h | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp index a00b903d48..db6c4f1867 100644 --- a/xfa/fgas/font/cfgas_fontmgr.cpp +++ b/xfa/fgas/font/cfgas_fontmgr.cpp @@ -632,7 +632,7 @@ ByteString CFX_FontSourceEnum_File::GetNextFile() { if (m_FolderPaths.empty()) return ""; pCurHandle = FX_OpenFolder(m_FolderPaths.back().c_str()); - FX_HandleParentPath hpp; + HandleParentPath hpp; hpp.pFileHandle = pCurHandle; hpp.bsParentPath = m_FolderPaths.back(); m_FolderQueue.push_back(hpp); @@ -657,7 +657,7 @@ ByteString CFX_FontSourceEnum_File::GetNextFile() { if (bsName == "." || bsName == "..") continue; if (bFolder) { - FX_HandleParentPath hpp; + HandleParentPath hpp; hpp.bsParentPath = m_FolderQueue.back().bsParentPath + bsFolderSeparator + bsName; hpp.pFileHandle = FX_OpenFolder(hpp.bsParentPath.c_str()); diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h index 903ab65937..0b17b1d133 100644 --- a/xfa/fgas/font/cfgas_fontmgr.h +++ b/xfa/fgas/font/cfgas_fontmgr.h @@ -111,16 +111,6 @@ class CFX_FontDescriptorInfo { } }; -struct FX_HandleParentPath { - FX_HandleParentPath() {} - FX_HandleParentPath(const FX_HandleParentPath& x) { - pFileHandle = x.pFileHandle; - bsParentPath = x.bsParentPath; - } - FX_FileHandle* pFileHandle; - ByteString bsParentPath; -}; - class CFX_FontSourceEnum_File { public: CFX_FontSourceEnum_File(); @@ -130,10 +120,20 @@ class CFX_FontSourceEnum_File { RetainPtr<CFX_CRTFileAccess> GetNext(); private: + struct HandleParentPath { + HandleParentPath() {} + HandleParentPath(const HandleParentPath& x) { + pFileHandle = x.pFileHandle; + bsParentPath = x.bsParentPath; + } + FX_FileHandle* pFileHandle; + ByteString bsParentPath; + }; + ByteString GetNextFile(); WideString m_wsNext; - std::vector<FX_HandleParentPath> m_FolderQueue; + std::vector<HandleParentPath> m_FolderQueue; std::vector<ByteString> m_FolderPaths; }; |