From 33db790486b89e9a84622788940fd7995e37cf5e Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 19 Aug 2015 10:03:29 -0700 Subject: Merge to XFA: Remove more dead code from fx_basic.h (cherry picked from commit 57207efd5f17ec63e174061ea5415afb58516fce) Original Review URL: https://codereview.chromium.org/1294683003 . TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1299263002 . --- core/include/fxcrt/fx_basic.h | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'core/include/fxcrt/fx_basic.h') diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index b31682105d..661722e1b2 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -267,28 +267,19 @@ class CFX_UTF8Decoder { CFX_WideTextBuf m_Buffer; }; + class CFX_UTF8Encoder { public: - CFX_UTF8Encoder() { m_UTF16First = 0; } + CFX_UTF8Encoder() {} void Input(FX_WCHAR unicode); - - void AppendStr(const CFX_ByteStringC& str) { - m_UTF16First = 0; - m_Buffer << str; - } - + void AppendStr(const CFX_ByteStringC& str) { m_Buffer << str; } CFX_ByteStringC GetResult() const { return m_Buffer.GetByteString(); } protected: CFX_ByteTextBuf m_Buffer; - - FX_DWORD m_UTF16First; }; -CFX_ByteString FX_UrlEncode(const CFX_WideString& wsUrl); -CFX_WideString FX_UrlDecode(const CFX_ByteString& bsUrl); -CFX_ByteString FX_EncodeURI(const CFX_WideString& wsURI); -CFX_WideString FX_DecodeURI(const CFX_ByteString& bsURI); + class CFX_BasicArray { protected: CFX_BasicArray(int unit_size); @@ -447,6 +438,7 @@ typedef CFX_ArrayTemplate CFX_PtrArray; typedef CFX_ArrayTemplate CFX_FileSizeArray; typedef CFX_ArrayTemplate CFX_FloatArray; typedef CFX_ArrayTemplate CFX_Int32Array; + template class CFX_ObjectArray : public CFX_BasicArray { public: -- cgit v1.2.3