<!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>[164183] trunk/Source/WebCore</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/164183">164183</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-15 16:36:36 -0800 (Sat, 15 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>HTMLTextFormControlElement::subtreeHasChanged should be called before updating selection
https://bugs.webkit.org/show_bug.cgi?id=128870
Reviewed by Darin Adler.
Extracted HTMLTextFormControlElement::didEditInnerTextValue out of HTMLTextFormControlElement::defaultEventHandler
and called it in appliedEditing, unappliedEditing, and reappliedEditing before updating selection.
* editing/Editor.cpp:
(WebCore::notifyTextFromControls): Added.
(WebCore::Editor::appliedEditing): Update text form control's internal states before updating selection.
(WebCore::Editor::unappliedEditing): Ditto.
(WebCore::Editor::reappliedEditing): Ditto.
* html/HTMLTextFormControlElement.cpp:
(WebCore::HTMLTextFormControlElement::didEditInnerTextValue):
* html/TextFieldInputType.cpp:
(WebCore::TextFieldInputType::subtreeHasChanged): Removed a stale assertion from the time we used to do
everything in the render tree.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementcpp">trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementh">trunk/Source/WebCore/html/HTMLTextFormControlElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlTextFieldInputTypecpp">trunk/Source/WebCore/html/TextFieldInputType.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164182 => 164183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-16 00:26:53 UTC (rev 164182)
+++ trunk/Source/WebCore/ChangeLog 2014-02-16 00:36:36 UTC (rev 164183)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-02-15 Ryosuke Niwa <rniwa@webkit.org>
+
+ HTMLTextFormControlElement::subtreeHasChanged should be called before updating selection
+ https://bugs.webkit.org/show_bug.cgi?id=128870
+
+ Reviewed by Darin Adler.
+
+ Extracted HTMLTextFormControlElement::didEditInnerTextValue out of HTMLTextFormControlElement::defaultEventHandler
+ and called it in appliedEditing, unappliedEditing, and reappliedEditing before updating selection.
+
+ * editing/Editor.cpp:
+ (WebCore::notifyTextFromControls): Added.
+ (WebCore::Editor::appliedEditing): Update text form control's internal states before updating selection.
+ (WebCore::Editor::unappliedEditing): Ditto.
+ (WebCore::Editor::reappliedEditing): Ditto.
+ * html/HTMLTextFormControlElement.cpp:
+ (WebCore::HTMLTextFormControlElement::didEditInnerTextValue):
+ * html/TextFieldInputType.cpp:
+ (WebCore::TextFieldInputType::subtreeHasChanged): Removed a stale assertion from the time we used to do
+ everything in the render tree.
+
</ins><span class="cx"> 2014-02-15 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Add checked casts for ScriptExecutionContext.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (164182 => 164183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp 2014-02-16 00:26:53 UTC (rev 164182)
+++ trunk/Source/WebCore/editing/Editor.cpp 2014-02-16 00:36:36 UTC (rev 164183)
</span><span class="lines">@@ -1055,6 +1055,16 @@
</span><span class="cx"> applyCommand(IndentOutdentCommand::create(document(), IndentOutdentCommand::Outdent));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void notifyTextFromControls(Element* startRoot, Element* endRoot)
+{
+ HTMLTextFormControlElement* startingTextControl = enclosingTextFormControl(firstPositionInOrBeforeNode(startRoot));
+ HTMLTextFormControlElement* endingTextControl = enclosingTextFormControl(firstPositionInOrBeforeNode(endRoot));
+ if (startingTextControl)
+ startingTextControl->didEditInnerTextValue();
+ if (endingTextControl && startingTextControl != endingTextControl)
+ endingTextControl->didEditInnerTextValue();
+}
+
</ins><span class="cx"> static void dispatchEditableContentChangedEvents(PassRefPtr<Element> prpStartRoot, PassRefPtr<Element> prpEndRoot)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<Element> startRoot = prpStartRoot;
</span><span class="lines">@@ -1075,6 +1085,8 @@
</span><span class="cx">
</span><span class="cx"> m_alternativeTextController->respondToAppliedEditing(cmd.get());
</span><span class="cx">
</span><ins>+ notifyTextFromControls(composition->startingRootEditableElement(), composition->endingRootEditableElement());
+
</ins><span class="cx"> // Don't clear the typing style with this selection change. We do those things elsewhere if necessary.
</span><span class="cx"> FrameSelection::SetSelectionOptions options = cmd->isDictationCommand() ? FrameSelection::DictationTriggered : 0;
</span><span class="cx"> changeSelectionAfterCommand(newSelection, options);
</span><span class="lines">@@ -1101,6 +1113,8 @@
</span><span class="cx"> {
</span><span class="cx"> document().updateLayout();
</span><span class="cx">
</span><ins>+ notifyTextFromControls(cmd->startingRootEditableElement(), cmd->endingRootEditableElement());
+
</ins><span class="cx"> VisibleSelection newSelection(cmd->startingSelection());
</span><span class="cx"> changeSelectionAfterCommand(newSelection, FrameSelection::defaultSetSelectionOptions());
</span><span class="cx"> dispatchEditableContentChangedEvents(cmd->startingRootEditableElement(), cmd->endingRootEditableElement());
</span><span class="lines">@@ -1117,6 +1131,8 @@
</span><span class="cx"> {
</span><span class="cx"> document().updateLayout();
</span><span class="cx">
</span><ins>+ notifyTextFromControls(cmd->startingRootEditableElement(), cmd->endingRootEditableElement());
+
</ins><span class="cx"> VisibleSelection newSelection(cmd->endingSelection());
</span><span class="cx"> changeSelectionAfterCommand(newSelection, FrameSelection::defaultSetSelectionOptions());
</span><span class="cx"> dispatchEditableContentChangedEvents(cmd->startingRootEditableElement(), cmd->endingRootEditableElement());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp (164182 => 164183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2014-02-16 00:26:53 UTC (rev 164182)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2014-02-16 00:36:36 UTC (rev 164183)
</span><span class="lines">@@ -102,15 +102,13 @@
</span><span class="cx"> HTMLFormControlElementWithState::dispatchBlurEvent(newFocusedElement);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HTMLTextFormControlElement::defaultEventHandler(Event* event)
</del><ins>+void HTMLTextFormControlElement::didEditInnerTextValue()
</ins><span class="cx"> {
</span><del>- if (event->type() == eventNames().webkitEditableContentChangedEvent && renderer() && renderer()->isTextControl()) {
- m_lastChangeWasUserEdit = true;
- subtreeHasChanged();
</del><ins>+ if (!isTextFormControl())
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><del>- HTMLFormControlElementWithState::defaultEventHandler(event);
</del><ins>+ m_lastChangeWasUserEdit = true;
+ subtreeHasChanged();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLTextFormControlElement::forwardEvent(Event* event)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.h (164182 => 164183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.h 2014-02-16 00:26:53 UTC (rev 164182)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.h 2014-02-16 00:36:36 UTC (rev 164183)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~HTMLTextFormControlElement();
</span><span class="cx">
</span><ins>+ void didEditInnerTextValue();
</ins><span class="cx"> void forwardEvent(Event*);
</span><span class="cx">
</span><span class="cx"> virtual InsertionNotificationRequest insertedInto(ContainerNode&) override;
</span><span class="lines">@@ -108,7 +109,6 @@
</span><span class="cx"> void restoreCachedSelection();
</span><span class="cx"> bool hasCachedSelection() const { return m_cachedSelectionStart >= 0; }
</span><span class="cx">
</span><del>- virtual void defaultEventHandler(Event*) override;
</del><span class="cx"> virtual void subtreeHasChanged() = 0;
</span><span class="cx">
</span><span class="cx"> void setLastChangeWasNotUserEdit() { m_lastChangeWasUserEdit = false; }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTextFieldInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (164182 => 164183)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2014-02-16 00:26:53 UTC (rev 164182)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2014-02-16 00:36:36 UTC (rev 164183)
</span><span class="lines">@@ -443,8 +443,6 @@
</span><span class="cx">
</span><span class="cx"> void TextFieldInputType::subtreeHasChanged()
</span><span class="cx"> {
</span><del>- ASSERT(element().renderer());
-
</del><span class="cx"> bool wasChanged = element().wasChangedSinceLastFormControlChangeEvent();
</span><span class="cx"> element().setChangedSinceLastFormControlChangeEvent(true);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>