<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185692] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185692">185692</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-17 21:38:59 -0700 (Wed, 17 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlTextFieldInputTypecpp">trunk/Source/WebCore/html/TextFieldInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlTextFieldInputTypeh">trunk/Source/WebCore/html/TextFieldInputType.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2TextFieldDidBeginAndEndEditingcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185691 => 185692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-18 04:11:05 UTC (rev 185691)
+++ trunk/Source/WebCore/ChangeLog 2015-06-18 04:38:59 UTC (rev 185692)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+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:
+
</ins><span class="cx"> 2015-06-17 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Fail to parse invalid arrays
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTextFieldInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (185691 => 185692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2015-06-18 04:11:05 UTC (rev 185691)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2015-06-18 04:38:59 UTC (rev 185692)
</span><span class="lines">@@ -206,17 +206,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> capsLockStateMayHaveChanged();
</span><del>- } else if (event->type() == eventNames().focusEvent) {
- if (Frame* frame = element().document().frame())
- frame->editor().textFieldDidBeginEditing(&element());
</del><ins>+ } else if (event->type() == eventNames().focusEvent)
</ins><span class="cx"> capsLockStateMayHaveChanged();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> element().forwardEvent(event);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TextFieldInputType::handleFocusEvent(Node* oldFocusedNode, FocusDirection)
+{
+ ASSERT_UNUSED(oldFocusedNode, oldFocusedNode != &element());
+ if (Frame* frame = element().document().frame())
+ frame->editor().textFieldDidBeginEditing(&element());
+}
+
</ins><span class="cx"> void TextFieldInputType::handleBlurEvent()
</span><span class="cx"> {
</span><span class="cx"> InputType::handleBlurEvent();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTextFieldInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextFieldInputType.h (185691 => 185692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextFieldInputType.h 2015-06-18 04:11:05 UTC (rev 185691)
+++ trunk/Source/WebCore/html/TextFieldInputType.h 2015-06-18 04:38:59 UTC (rev 185692)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> virtual void disabledAttributeChanged() override final;
</span><span class="cx"> virtual void readonlyAttributeChanged() override final;
</span><span class="cx"> virtual bool supportsReadOnly() const override final;
</span><ins>+ void handleFocusEvent(Node* oldFocusedNode, FocusDirection) override final;
</ins><span class="cx"> virtual void handleBlurEvent() override final;
</span><span class="cx"> virtual void setValue(const String&, bool valueChanged, TextFieldEventBehavior) override;
</span><span class="cx"> virtual void updateInnerTextValue() override final;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185691 => 185692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-18 04:11:05 UTC (rev 185691)
+++ trunk/Tools/ChangeLog 2015-06-18 04:38:59 UTC (rev 185692)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+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):
+
</ins><span class="cx"> 2015-06-17 Hyungwook Lee <hyungwook.lee@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [Win]Implement layoutTestController.dispatchPendingLoadRequests.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2TextFieldDidBeginAndEndEditingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp (185691 => 185692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp 2015-06-18 04:11:05 UTC (rev 185691)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/TextFieldDidBeginAndEndEditing.cpp 2015-06-18 04:38:59 UTC (rev 185692)
</span><span class="lines">@@ -120,6 +120,12 @@
</span><span class="cx"> executeJavaScriptAndCheckDidReceiveMessage("blurTextField('readonly')", "DidReceiveTextFieldDidEndEditing");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST_F(WebKit2TextFieldBeginAndEditEditingTest, TextFieldDidBeginShouldNotBeDispatchedForAlreadyFocusedField)
+{
+ executeJavaScriptAndCheckDidReceiveMessage("focusTextField('input'); focusTextField('input')", "DidReceiveTextFieldDidBeginEditing");
+ executeJavaScriptAndCheckDidReceiveMessage("blurTextField('input')", "DidReceiveTextFieldDidEndEditing");
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>