1 files changed, 13 insertions, 7 deletions
diff --git a/chromium/third_party/WebKit/Source/wtf/text/Base64.h b/chromium/third_party/WebKit/Source/wtf/text/Base64.h
index 4ebebc82dcb..7ccd8d1c7c8 100644
--- a/chromium/third_party/WebKit/Source/wtf/text/Base64.h
+++ b/chromium/third_party/WebKit/Source/wtf/text/Base64.h
@@ -39,13 +39,17 @@ enum Base64EncodePolicy {
     Base64InsertLFs
 };
 
-enum Base64DecodePolicy {
-    Base64FailOnInvalidCharacterOrExcessPadding,
+enum Base64InvalidCharactersPolicy {
     Base64FailOnInvalidCharacter,
     Base64IgnoreWhitespace,
     Base64IgnoreInvalidCharacters
 };
 
+enum Base64PaddingValidationPolicy {
+    Base64NoPaddingValidation,
+    Base64StrictPaddingValidation
+};
+
 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);
@@ -53,9 +57,9 @@ 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 String&, Vector<char>&, Base64InvalidCharactersPolicy = Base64FailOnInvalidCharacter, Base64PaddingValidationPolicy = Base64NoPaddingValidation);
+WTF_EXPORT bool base64Decode(const Vector<char>&, Vector<char>&, Base64InvalidCharactersPolicy = Base64FailOnInvalidCharacter, Base64PaddingValidationPolicy = Base64NoPaddingValidation);
+WTF_EXPORT bool base64Decode(const char*, unsigned, Vector<char>&, Base64InvalidCharactersPolicy = Base64FailOnInvalidCharacter, Base64PaddingValidationPolicy = Base64NoPaddingValidation);
 
 inline void base64Encode(const Vector<char>& in, Vector<char>& out, Base64EncodePolicy policy)
 {
@@ -82,11 +86,13 @@ inline String base64Encode(const CString& in, Base64EncodePolicy policy)
 using WTF::Base64EncodePolicy;
 using WTF::Base64DoNotInsertLFs;
 using WTF::Base64InsertLFs;
-using WTF::Base64DecodePolicy;
-using WTF::Base64FailOnInvalidCharacterOrExcessPadding;
+using WTF::Base64InvalidCharactersPolicy;
 using WTF::Base64FailOnInvalidCharacter;
 using WTF::Base64IgnoreWhitespace;
 using WTF::Base64IgnoreInvalidCharacters;
+using WTF::Base64PaddingValidationPolicy;
+using WTF::Base64NoPaddingValidation;
+using WTF::Base64StrictPaddingValidation;
 using WTF::base64Encode;
 using WTF::base64Decode;