summaryrefslogtreecommitdiff
path: root/core/include/fxcrt/fx_basic.h
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2016-02-19 14:26:46 -0800
committerLei Zhang <thestig@chromium.org>2016-02-19 14:26:46 -0800
commit11d33361e95d5ea61ee43e4261fa8f53aa372731 (patch)
treedf81483804ef757d6f3c6f91531e7deae1eebf42 /core/include/fxcrt/fx_basic.h
parent84e5a12f186a00bf37a26cc13965f65c25561bd1 (diff)
downloadpdfium-11d33361e95d5ea61ee43e4261fa8f53aa372731.tar.xz
Get rid of CFX_CharMap instantiations.
The only thing left are a couple of static methods. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1711273002 .
Diffstat (limited to 'core/include/fxcrt/fx_basic.h')
-rw-r--r--core/include/fxcrt/fx_basic.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index 4402856996..3e30b1d1a1 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -221,17 +221,17 @@ class CFX_FileBufferArchive : public IFX_BufferArchive {
FX_BOOL m_bTakeover;
};
-struct CFX_CharMap {
- static CFX_CharMap* GetDefaultMapper(int32_t codepage = 0);
-
- CFX_WideString (*m_GetWideString)(CFX_CharMap* pMap,
- const CFX_ByteString& bstr);
+class CFX_CharMap {
+ public:
+ static CFX_ByteString GetByteString(FX_WORD codepage,
+ const CFX_WideString& wstr);
- CFX_ByteString (*m_GetByteString)(CFX_CharMap* pMap,
- const CFX_WideString& wstr);
+ static CFX_WideString GetWideString(FX_WORD codepage,
+ const CFX_ByteString& bstr);
- int32_t (*m_GetCodePage)();
+ CFX_CharMap() = delete;
};
+
class CFX_UTF8Decoder {
public:
CFX_UTF8Decoder() { m_PendingBytes = 0; }