Changeset 49508 in webkit

Timestamp:

Oct 13, 2009 1:53:12 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-13 Michelangelo De Simone <​micdesim@gmail.com>

Reviewed by Adam Barth.

​https://bugs.webkit.org/show_bug.cgi?id=27457
Test case for static email validation on type=email input elements as
per HTML5 specs:
​http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state

• fast/forms/ValidityState-typeMismatch-email-expected.txt: Added.
• fast/forms/ValidityState-typeMismatch-email.html: Added.
• fast/forms/resources/ValidityState-typeMismatch-email.js: Added. ():

2009-10-13 Michelangelo De Simone <​micdesim@gmail.com>

Reviewed by Adam Barth.

​https://bugs.webkit.org/show_bug.cgi?id=27457
Added support for static validation on type=email input elements as per
HTML5 specs:
​http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state

Test: fast/forms/ValidityState-typeMismatch-email.html

• html/ValidityState.cpp: (WebCore::ValidityState::typeMismatch): ValidityState.typeMismatch performs validation on type=email input elements now. (WebCore::ValidityState::isValidEmailAddress): simple validation method
• html/ValidityState.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/ValidityState-typeMismatch-email-expected.txt (added)
• LayoutTests/fast/forms/ValidityState-typeMismatch-email.html (added)
• LayoutTests/fast/forms/resources/ValidityState-typeMismatch-email.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/ValidityState.cpp (modified) (3 diffs)
• WebCore/html/ValidityState.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-10-13  Michelangelo De Simone  <micdesim@gmail.com>
+
+        Reviewed by Adam Barth.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27457
+        Test case for static email validation on type=email input elements as
+        per HTML5 specs:
+        http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state
+
+        * fast/forms/ValidityState-typeMismatch-email-expected.txt: Added.
+        * fast/forms/ValidityState-typeMismatch-email.html: Added.
+        * fast/forms/resources/ValidityState-typeMismatch-email.js: Added.
+        ():
+
 2009-10-13  Dmitry Titov  <dimich@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-13  Michelangelo De Simone  <micdesim@gmail.com>
+
+        Reviewed by Adam Barth.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27457
+        Added support for static validation on type=email input elements as per
+        HTML5 specs:
+        http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state
+
+        Test: fast/forms/ValidityState-typeMismatch-email.html
+
+        * html/ValidityState.cpp:
+        (WebCore::ValidityState::typeMismatch): ValidityState.typeMismatch
+        performs validation on type=email input elements now.
+        (WebCore::ValidityState::isValidEmailAddress): simple validation method 
+        * html/ValidityState.h:
+
 2009-10-13  Dmitry Titov  <dimich@chromium.org>
 

trunk/WebCore/html/ValidityState.cpp

@@ -27 +27 @@
 #include "HTMLNames.h"
 #include "KURL.h"
+#include "RegularExpression.h"
+#include <wtf/StdLibExtras.h>
+
+#define EMAIL_LOCALPART "[a-z0-9!#$%&'*+/=?^_`{|}~.-]+"
+#define EMAIL_DOMAINPART "[a-z0-9-]+(\\.[a-z0-9-]+)+"
+#define EMAIL_PATTERN EMAIL_LOCALPART "@" EMAIL_DOMAINPART
 
 namespace WebCore {
@@ -56 +62 @@
     case HTMLInputElement::URL:
         return !KURL(KURL(), value).isValid();
+    case HTMLInputElement::EMAIL:
+    {
+        if (!input->multiple())
+            return !isValidEmailAddress(value);
+            
+        Vector<String> email_list;
+        value.split(',', email_list);
+        for (unsigned i = 0; i < email_list.size(); ++i)
+            if (!isValidEmailAddress(email_list[i]))
+                return true;
+
+        return false;
+    }
     default:
         return false;
@@ -96 +115 @@
 }
 
+bool ValidityState::isValidEmailAddress(const String& email)
+{
+    if (email.isEmpty())
+        return false;
+
+    DEFINE_STATIC_LOCAL(AtomicString, emailPattern, (EMAIL_PATTERN));
+    DEFINE_STATIC_LOCAL(RegularExpression, regExp, (emailPattern, TextCaseInsensitive));
+
+    int matchLength = 0;
+    int emailLength = email.length();
+    int matchOffset = regExp.match(email, 0, &matchLength);
+
+    return matchOffset == 0 && matchLength == emailLength;
+}
+
 } // namespace

trunk/WebCore/html/ValidityState.h

@@ -57 +57 @@
 
         static bool isValidColorString(const String&);
+        bool isValidEmailAddress(const String&);
     };