Changeset 150587 in webkit

Timestamp:

May 23, 2013 8:55:18 AM (11 years ago)

Author:

mifenton@rim.com

Message:

[BlackBerry] Validate form data before doing direct submission.
​https://bugs.webkit.org/show_bug.cgi?id=116674

Reviewed by Xan Lopez.

PR 314202.

Check validation of the input form before triggering direct submission.

Internally Reviewed by Nima Ghanavatian.

• WebKitSupport/InputHandler.cpp:

(BlackBerry::WebKit::InputHandler::submitForm):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/InputHandler.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-23  Mike Fenton  <mifenton@rim.com>
+
+        [BlackBerry] Validate form data before doing direct submission.
+        https://bugs.webkit.org/show_bug.cgi?id=116674
+
+        Reviewed by Xan Lopez.
+
+        PR 314202.
+
+        Check validation of the input form before triggering direct submission.
+
+        Internally Reviewed by Nima Ghanavatian.
+
+        * WebKitSupport/InputHandler.cpp:
+        (BlackBerry::WebKit::InputHandler::submitForm):
+
 2013-05-23  Rob Buis  <rbuis@rim.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp

@@ -1009 +1009 @@
 
     InputLog(Platform::LogLevelInfo, "InputHandler::submitForm triggered");
-    if (elementType(m_currentFocusElement.get()) == InputTypeTextArea)
+
+    if (elementType(m_currentFocusElement.get()) != InputTypeTextArea) {
+        handleKeyboardInput(Platform::KeyboardEvent(KEYCODE_RETURN, Platform::KeyboardEvent::KeyChar, 0), false /* changeIsPartOfComposition */);
+
+        // Did this clear the focus? If so, form was submitted or invalid.
+        if (!isActiveTextEdit())
+            return;
+    }
+
+    // Validate form data and if valid, submit.
+    if (formElement->checkValidity())
         formElement->submit();
-    else {
-        handleKeyboardInput(Platform::KeyboardEvent(KEYCODE_RETURN, Platform::KeyboardEvent::KeyChar, 0), false /* changeIsPartOfComposition */);
-
-        // Confirm that implicit submission was accepted.
-        if (isActiveTextEdit())
-            formElement->submit();
-    }
 }