Index: Source/wtf/text/Base64.h |
diff --git a/Source/wtf/text/Base64.h b/Source/wtf/text/Base64.h |
index 3d02f98bd8377d75967d6b4dbfac14ee01dca884..8abaae8ac4a4f4e63bf31aeea1a0c9ff5d29685b 100644 |
--- a/Source/wtf/text/Base64.h |
+++ b/Source/wtf/text/Base64.h |
@@ -40,10 +40,8 @@ enum Base64EncodePolicy { |
}; |
enum Base64DecodePolicy { |
- Base64FailOnInvalidCharacterOrExcessPadding, |
- Base64FailOnInvalidCharacter, |
- Base64IgnoreWhitespace, |
- Base64IgnoreInvalidCharacters |
+ DoNotValidatePadding, |
tkent
2013/11/05 21:39:07
We should keep |Base64| prefix to decrease possibi
Inactive
2013/11/05 21:55:57
Very good point, my bad.
|
+ ValidatePadding |
}; |
WTF_EXPORT void base64Encode(const char*, unsigned, Vector<char>&, Base64EncodePolicy = Base64DoNotInsertLFs); |
@@ -53,10 +51,10 @@ WTF_EXPORT String base64Encode(const char*, unsigned, Base64EncodePolicy = Base6 |
WTF_EXPORT String base64Encode(const Vector<char>&, Base64EncodePolicy = Base64DoNotInsertLFs); |
WTF_EXPORT String base64Encode(const CString&, Base64EncodePolicy = Base64DoNotInsertLFs); |
-WTF_EXPORT bool base64Decode(const String&, Vector<char>&, Base64DecodePolicy = Base64FailOnInvalidCharacter); |
-WTF_EXPORT bool base64Decode(const Vector<char>&, Vector<char>&, Base64DecodePolicy = Base64FailOnInvalidCharacter); |
-WTF_EXPORT bool base64Decode(const char*, unsigned, Vector<char>&, Base64DecodePolicy = Base64FailOnInvalidCharacter); |
-WTF_EXPORT bool base64Decode(const UChar*, unsigned, Vector<char>&, Base64DecodePolicy = Base64FailOnInvalidCharacter); |
+WTF_EXPORT bool base64Decode(const String&, Vector<char>&, CharacterMatchFunctionPtr shouldIgnoreCharacter = 0, Base64DecodePolicy = DoNotValidatePadding); |
+WTF_EXPORT bool base64Decode(const Vector<char>&, Vector<char>&, CharacterMatchFunctionPtr shouldIgnoreCharacter = 0, Base64DecodePolicy = DoNotValidatePadding); |
+WTF_EXPORT bool base64Decode(const char*, unsigned, Vector<char>&, CharacterMatchFunctionPtr shouldIgnoreCharacter = 0, Base64DecodePolicy = DoNotValidatePadding); |
+WTF_EXPORT bool base64Decode(const UChar*, unsigned, Vector<char>&, CharacterMatchFunctionPtr shouldIgnoreCharacter = 0, Base64DecodePolicy = DoNotValidatePadding); |
inline void base64Encode(const Vector<char>& in, Vector<char>& out, Base64EncodePolicy policy) |
{ |
@@ -84,10 +82,8 @@ using WTF::Base64EncodePolicy; |
using WTF::Base64DoNotInsertLFs; |
using WTF::Base64InsertLFs; |
using WTF::Base64DecodePolicy; |
-using WTF::Base64FailOnInvalidCharacterOrExcessPadding; |
-using WTF::Base64FailOnInvalidCharacter; |
-using WTF::Base64IgnoreWhitespace; |
-using WTF::Base64IgnoreInvalidCharacters; |
+using WTF::DoNotValidatePadding; |
+using WTF::ValidatePadding; |
using WTF::base64Encode; |
using WTF::base64Decode; |