Changeset 202578 in webkit

Timestamp:

Jun 28, 2016 11:20:42 AM (8 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION(r201471): FormClient.textFieldDidEndEditing is no longer called when a text field is removed
​https://bugs.webkit.org/show_bug.cgi?id=159199
Source/WebCore:

<rdar://problem/26748189>

Reviewed by Alexey Proskuryakov.

The bug was caused by HTMLInputElement's endEditing no longer getting called due to the behavior change.
Preserve the WebKit2 API semantics by manually calling HTMLInputElement::endEditing in setFocusedElement.

Tests: WebKit2TextFieldDidBeginAndEndEditing

• dom/Document.cpp:

(WebCore::Document::setFocusedElement):

Tools:

Reviewed by Alexey Proskuryakov.

Added a test case for removing a text field. Also fixed the flakiness and re-enabled it on Mac.

• TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp:
• TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing_Bundle.cpp:
• TestWebKitAPI/Tests/WebKit2/input-focus-blur.html: Focus a div upfront to avoid the flakiness from

an input element getting automatically focused on Mac.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp (modified) (2 diffs)
• Tools/TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing_Bundle.cpp (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2/input-focus-blur.html (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r201471): FormClient.textFieldDidEndEditing is no longer called when a text field is removed
+        https://bugs.webkit.org/show_bug.cgi?id=159199
+        <rdar://problem/26748189>
+
+        Reviewed by Alexey Proskuryakov.
+
+        The bug was caused by HTMLInputElement's endEditing no longer getting called due to the behavior change.
+        Preserve the WebKit2 API semantics by manually calling HTMLInputElement::endEditing in setFocusedElement.
+
+        Tests: WebKit2TextFieldDidBeginAndEndEditing
+
+        * dom/Document.cpp:
+        (WebCore::Document::setFocusedElement):
+
 2016-06-28  Frederic Wang  <fwang@igalia.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -83 +83 @@
 #include "HTMLIFrameElement.h"
 #include "HTMLImageElement.h"
+#include "HTMLInputElement.h"
 #include "HTMLLinkElement.h"
 #include "HTMLMediaElement.h"
@@ -3809 +3810 @@
                 newFocusedElement = nullptr;
             }
-        } else
+        } else {
+            if (is<HTMLInputElement>(*oldFocusedElement))
+                downcast<HTMLInputElement>(*oldFocusedElement).endEditing();
             ASSERT(!m_focusedElement);
+        }
 
         if (oldFocusedElement->isRootEditableElement())

trunk/Tools/ChangeLog

@@ +1 @@
+2016-06-28  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r201471): FormClient.textFieldDidEndEditing is no longer called when a text field is removed
+        https://bugs.webkit.org/show_bug.cgi?id=159199
+
+        Reviewed by Alexey Proskuryakov.
+
+        Added a test case for removing a text field. Also fixed the flakiness and re-enabled it on Mac.
+
+        * TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp:
+        * TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing_Bundle.cpp:
+        * TestWebKitAPI/Tests/WebKit2/input-focus-blur.html: Focus a div upfront to avoid the flakiness from
+        an input element getting automatically focused on Mac.
+
 2016-06-28  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp

@@ -26 +26 @@
 #include "config.h"
 
-#if WK_HAVE_C_SPI && !PLATFORM(MAC)
+#if WK_HAVE_C_SPI
 
 #include "PlatformUtilities.h"
@@ -127 +127 @@
 }
 
+TEST_F(WebKit2TextFieldBeginAndEditEditingTest, TextFieldDidEndShouldBeDispatchedForRemovedFocusField)
+{
+    executeJavaScriptAndCheckDidReceiveMessage("focusTextField('input')", "DidReceiveTextFieldDidBeginEditing");
+    executeJavaScriptAndCheckDidReceiveMessage("removeTextField('input')", "DidReceiveTextFieldDidEndEditing");
+}
+
 } // namespace TestWebKitAPI
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing_Bundle.cpp

@@ -26 +26 @@
 #include "config.h"
 
-#if WK_HAVE_C_SPI && !PLATFORM(MAC)
+#if WK_HAVE_C_SPI
 
 #include "InjectedBundleTest.h"

trunk/Tools/TestWebKitAPI/Tests/WebKit2/input-focus-blur.html

@@ -2 +2 @@
 <html>
 <body>
+<div tabindex=0></div>
 <input id="input" type="text">
 <input id="readonly" type="text" readonly>
 <script>
+
+document.querySelector('div').focus();
+
 function focusTextField(id)
 {
@@ -14 +18 @@
     document.getElementById(id).blur();
 }
+
+function removeTextField(id)
+{
+    document.getElementById(id).remove();
+}
+
 </script>
 </body>