| Index: third_party/WebKit/Source/wtf/text/Base64.h
|
| diff --git a/third_party/WebKit/Source/wtf/text/Base64.h b/third_party/WebKit/Source/wtf/text/Base64.h
|
| index b42e000743c245b71d079b0f63cdd78e9eb45190..7a4496e6f331114bc76750567c7c2a597908600f 100644
|
| --- a/third_party/WebKit/Source/wtf/text/Base64.h
|
| +++ b/third_party/WebKit/Source/wtf/text/Base64.h
|
| @@ -34,61 +34,88 @@
|
|
|
| namespace WTF {
|
|
|
| -enum Base64EncodePolicy {
|
| - Base64DoNotInsertLFs,
|
| - Base64InsertLFs
|
| -};
|
| -
|
| -enum Base64DecodePolicy {
|
| - Base64DoNotValidatePadding,
|
| - Base64ValidatePadding
|
| -};
|
| -
|
| -WTF_EXPORT void base64Encode(const char*, unsigned, Vector<char>&, Base64EncodePolicy = Base64DoNotInsertLFs);
|
| -WTF_EXPORT void base64Encode(const Vector<char>&, Vector<char>&, Base64EncodePolicy = Base64DoNotInsertLFs);
|
| -WTF_EXPORT void base64Encode(const CString&, Vector<char>&, Base64EncodePolicy = Base64DoNotInsertLFs);
|
| -WTF_EXPORT String base64Encode(const char*, unsigned, Base64EncodePolicy = Base64DoNotInsertLFs);
|
| -WTF_EXPORT String base64Encode(const Vector<char>&, Base64EncodePolicy = Base64DoNotInsertLFs);
|
| -WTF_EXPORT String base64Encode(const Vector<unsigned char>&, Base64EncodePolicy = Base64DoNotInsertLFs);
|
| -WTF_EXPORT String base64Encode(const CString&, Base64EncodePolicy = Base64DoNotInsertLFs);
|
| -
|
| -WTF_EXPORT bool base64Decode(const String&, Vector<char>&, CharacterMatchFunctionPtr shouldIgnoreCharacter = 0, Base64DecodePolicy = Base64DoNotValidatePadding);
|
| -WTF_EXPORT bool base64Decode(const Vector<char>&, Vector<char>&, CharacterMatchFunctionPtr shouldIgnoreCharacter = 0, Base64DecodePolicy = Base64DoNotValidatePadding);
|
| -WTF_EXPORT bool base64Decode(const char*, unsigned, Vector<char>&, CharacterMatchFunctionPtr shouldIgnoreCharacter = 0, Base64DecodePolicy = Base64DoNotValidatePadding);
|
| -WTF_EXPORT bool base64Decode(const UChar*, unsigned, Vector<char>&, CharacterMatchFunctionPtr shouldIgnoreCharacter = 0, Base64DecodePolicy = Base64DoNotValidatePadding);
|
| +enum Base64EncodePolicy { Base64DoNotInsertLFs, Base64InsertLFs };
|
| +
|
| +enum Base64DecodePolicy { Base64DoNotValidatePadding, Base64ValidatePadding };
|
| +
|
| +WTF_EXPORT void base64Encode(const char*,
|
| + unsigned,
|
| + Vector<char>&,
|
| + Base64EncodePolicy = Base64DoNotInsertLFs);
|
| +WTF_EXPORT void base64Encode(const Vector<char>&,
|
| + Vector<char>&,
|
| + Base64EncodePolicy = Base64DoNotInsertLFs);
|
| +WTF_EXPORT void base64Encode(const CString&,
|
| + Vector<char>&,
|
| + Base64EncodePolicy = Base64DoNotInsertLFs);
|
| +WTF_EXPORT String base64Encode(const char*,
|
| + unsigned,
|
| + Base64EncodePolicy = Base64DoNotInsertLFs);
|
| +WTF_EXPORT String base64Encode(const Vector<char>&,
|
| + Base64EncodePolicy = Base64DoNotInsertLFs);
|
| +WTF_EXPORT String base64Encode(const Vector<unsigned char>&,
|
| + Base64EncodePolicy = Base64DoNotInsertLFs);
|
| +WTF_EXPORT String base64Encode(const CString&,
|
| + Base64EncodePolicy = Base64DoNotInsertLFs);
|
| +
|
| +WTF_EXPORT bool base64Decode(
|
| + const String&,
|
| + Vector<char>&,
|
| + CharacterMatchFunctionPtr shouldIgnoreCharacter = 0,
|
| + Base64DecodePolicy = Base64DoNotValidatePadding);
|
| +WTF_EXPORT bool base64Decode(
|
| + const Vector<char>&,
|
| + Vector<char>&,
|
| + CharacterMatchFunctionPtr shouldIgnoreCharacter = 0,
|
| + Base64DecodePolicy = Base64DoNotValidatePadding);
|
| +WTF_EXPORT bool base64Decode(
|
| + const char*,
|
| + unsigned,
|
| + Vector<char>&,
|
| + CharacterMatchFunctionPtr shouldIgnoreCharacter = 0,
|
| + Base64DecodePolicy = Base64DoNotValidatePadding);
|
| +WTF_EXPORT bool base64Decode(
|
| + const UChar*,
|
| + unsigned,
|
| + Vector<char>&,
|
| + CharacterMatchFunctionPtr shouldIgnoreCharacter = 0,
|
| + Base64DecodePolicy = Base64DoNotValidatePadding);
|
|
|
| // Given an encoding in either base64 or base64url, returns a normalized
|
| // encoding in plain base64.
|
| WTF_EXPORT String normalizeToBase64(const String&);
|
|
|
| -WTF_EXPORT String base64URLEncode(const char*, unsigned, Base64EncodePolicy = Base64DoNotInsertLFs);
|
| +WTF_EXPORT String base64URLEncode(const char*,
|
| + unsigned,
|
| + Base64EncodePolicy = Base64DoNotInsertLFs);
|
|
|
| -inline void base64Encode(const Vector<char>& in, Vector<char>& out, Base64EncodePolicy policy)
|
| -{
|
| - base64Encode(in.data(), in.size(), out, policy);
|
| +inline void base64Encode(const Vector<char>& in,
|
| + Vector<char>& out,
|
| + Base64EncodePolicy policy) {
|
| + base64Encode(in.data(), in.size(), out, policy);
|
| }
|
|
|
| -inline void base64Encode(const CString& in, Vector<char>& out, Base64EncodePolicy policy)
|
| -{
|
| - base64Encode(in.data(), in.length(), out, policy);
|
| +inline void base64Encode(const CString& in,
|
| + Vector<char>& out,
|
| + Base64EncodePolicy policy) {
|
| + base64Encode(in.data(), in.length(), out, policy);
|
| }
|
|
|
| -inline String base64Encode(const Vector<char>& in, Base64EncodePolicy policy)
|
| -{
|
| - return base64Encode(in.data(), in.size(), policy);
|
| +inline String base64Encode(const Vector<char>& in, Base64EncodePolicy policy) {
|
| + return base64Encode(in.data(), in.size(), policy);
|
| }
|
|
|
| -inline String base64Encode(const Vector<unsigned char>& in, Base64EncodePolicy policy)
|
| -{
|
| - return base64Encode(reinterpret_cast<const char*>(in.data()), in.size(), policy);
|
| +inline String base64Encode(const Vector<unsigned char>& in,
|
| + Base64EncodePolicy policy) {
|
| + return base64Encode(reinterpret_cast<const char*>(in.data()), in.size(),
|
| + policy);
|
| }
|
|
|
| -inline String base64Encode(const CString& in, Base64EncodePolicy policy)
|
| -{
|
| - return base64Encode(in.data(), in.length(), policy);
|
| +inline String base64Encode(const CString& in, Base64EncodePolicy policy) {
|
| + return base64Encode(in.data(), in.length(), policy);
|
| }
|
|
|
| -} // namespace WTF
|
| +} // namespace WTF
|
|
|
| using WTF::Base64EncodePolicy;
|
| using WTF::Base64DoNotInsertLFs;
|
| @@ -99,4 +126,4 @@ using WTF::Base64ValidatePadding;
|
| using WTF::base64Encode;
|
| using WTF::base64Decode;
|
|
|
| -#endif // Base64_h
|
| +#endif // Base64_h
|
|
|