Changeset 185692 in webkit

Timestamp:

Jun 17, 2015, 9:38:59 PM (11 years ago)

Author:

dbates@webkit.org

Message:

Client may receive began editing callback for already focused text field
​https://bugs.webkit.org/show_bug.cgi?id=146074
<rdar://problem/21293562>

Reviewed by Darin Adler.

Source/WebCore:

Fixes an issue where the client would be notified that began editing in a text field
for each programmatic DOM focus event dispatched at the text field regardless of
whether the field was focused. The client should only be notified that began editing
exactly once when a text field becomes focused (either programmatically or by user interaction).

• html/TextFieldInputType.cpp:

(WebCore::TextFieldInputType::forwardEvent): Move logic to dispatch editing began callback from here...
(WebCore::TextFieldInputType::handleFocusEvent): to here. This function is called when the
text field becomes newly focused.

• html/TextFieldInputType.h:

Tools:

Add a unit test to ensure that a client receives exactly one began editing
callback when a text field is newly focused. In particular, dispatching
a DOM focus event at an already focused text field does not dispatch a
began editing callback to the client.

• TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp:

(TestWebKitAPI::TEST_F):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/TextFieldInputType.cpp (modified) (1 diff)
• Source/WebCore/html/TextFieldInputType.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-17  Daniel Bates  <dabates@apple.com>
+
+        Client may receive began editing callback for already focused text field
+        https://bugs.webkit.org/show_bug.cgi?id=146074
+        <rdar://problem/21293562>
+
+        Reviewed by Darin Adler.
+
+        Fixes an issue where the client would be notified that began editing in a text field
+        for each programmatic DOM focus event dispatched at the text field regardless of
+        whether the field was focused. The client should only be notified that began editing
+        exactly once when a text field becomes focused (either programmatically or by user interaction).
+
+        * html/TextFieldInputType.cpp:
+        (WebCore::TextFieldInputType::forwardEvent): Move logic to dispatch editing began callback from here...
+        (WebCore::TextFieldInputType::handleFocusEvent): to here. This function is called when the
+        text field becomes newly focused.
+        * html/TextFieldInputType.h:
+
 2015-06-17  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/html/TextFieldInputType.cpp

@@ -207 +207 @@
 
                 capsLockStateMayHaveChanged();
-            } else if (event->type() == eventNames().focusEvent) {
-                if (Frame* frame = element().document().frame())
-                    frame->editor().textFieldDidBeginEditing(&element());
+            } else if (event->type() == eventNames().focusEvent)
                 capsLockStateMayHaveChanged();
-            }
 
             element().forwardEvent(event);
         }
     }
+}
+
+void TextFieldInputType::handleFocusEvent(Node* oldFocusedNode, FocusDirection)
+{
+    ASSERT_UNUSED(oldFocusedNode, oldFocusedNode != &element());
+    if (Frame* frame = element().document().frame())
+        frame->editor().textFieldDidBeginEditing(&element());
 }
 

trunk/Source/WebCore/html/TextFieldInputType.h

@@ -65 +65 @@
     virtual void readonlyAttributeChanged() override final;
     virtual bool supportsReadOnly() const override final;
+    void handleFocusEvent(Node* oldFocusedNode, FocusDirection) override final;
     virtual void handleBlurEvent() override final;
     virtual void setValue(const String&, bool valueChanged, TextFieldEventBehavior) override;

trunk/Tools/ChangeLog

@@ +1 @@
+2015-06-17  Daniel Bates  <dabates@apple.com>
+
+        Client may receive began editing callback for already focused text field
+        https://bugs.webkit.org/show_bug.cgi?id=146074
+        <rdar://problem/21293562>
+
+        Reviewed by Darin Adler.
+
+        Add a unit test to ensure that a client receives exactly one began editing
+        callback when a text field is newly focused. In particular, dispatching
+        a DOM focus event at an already focused text field does not dispatch a
+        began editing callback to the client.
+
+        * TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp:
+        (TestWebKitAPI::TEST_F):
+
 2015-06-17  Hyungwook Lee  <hyungwook.lee@navercorp.com>
 

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

@@ -121 +121 @@
 }
 
+TEST_F(WebKit2TextFieldBeginAndEditEditingTest, TextFieldDidBeginShouldNotBeDispatchedForAlreadyFocusedField)
+{
+    executeJavaScriptAndCheckDidReceiveMessage("focusTextField('input'); focusTextField('input')", "DidReceiveTextFieldDidBeginEditing");
+    executeJavaScriptAndCheckDidReceiveMessage("blurTextField('input')", "DidReceiveTextFieldDidEndEditing");
+}
+
 } // namespace TestWebKitAPI