summaryrefslogtreecommitdiff
path: root/core/include/fxcrt/fx_basic.h
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-08-19 10:03:29 -0700
committerTom Sepez <tsepez@chromium.org>2015-08-19 10:03:29 -0700
commit33db790486b89e9a84622788940fd7995e37cf5e (patch)
tree91bfb2df31fddce5e645b290fe658031288c74d7 /core/include/fxcrt/fx_basic.h
parent90b5442f15cecbcf11ac5f6cea3ce612ad863363 (diff)
downloadpdfium-33db790486b89e9a84622788940fd7995e37cf5e.tar.xz
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 .
Diffstat (limited to 'core/include/fxcrt/fx_basic.h')
-rw-r--r--core/include/fxcrt/fx_basic.h18
1 files changed, 5 insertions, 13 deletions
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<void*> CFX_PtrArray;
typedef CFX_ArrayTemplate<FX_FILESIZE> CFX_FileSizeArray;
typedef CFX_ArrayTemplate<FX_FLOAT> CFX_FloatArray;
typedef CFX_ArrayTemplate<int32_t> CFX_Int32Array;
+
template <class ObjectClass>
class CFX_ObjectArray : public CFX_BasicArray {
public: