<!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>[176030] 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/176030">176030</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-12 12:07:54 -0800 (Wed, 12 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Speed up HTMLTextFormControlElement::setInnerTextValue() a bit
https://bugs.webkit.org/show_bug.cgi?id=138619
Reviewed by Darin Adler.
Speed up HTMLTextFormControlElement::setInnerTextValue() a bit by:
- Not doing a virtual isTextFormControl() call. Relying on innerTextElement()
not returning null is sufficient.
- Caching the result of innerTextElement() instead of repeatedly calling that
virtual function.
- De-virtualizing setFormControlValueMatchesRenderer() /
formControlValueMatchesRenderer() as these are never overridden.
- Moving the code constructing the innerTextValue from a
TextControlInnerTextElement from innerTextValue() to a new
innerTextValueFrom(TextControlInnerTextElement&) function and call this new
function from setInnerTextValue() to avoid calling innerTextElement() again
and making sure it is non-null
- Do the tree traversal from innerTextElement's firstChild instead of from
innerTextElement. The innerTextElement is a TextControlInnerTextElement.
Therefore, it cannot be an HTMLBRElement or a Text node.
No new tests, no behavior change.
* html/HTMLFormControlElement.h:
(WebCore::HTMLFormControlElement::formControlValueMatchesRenderer):
(WebCore::HTMLFormControlElement::setFormControlValueMatchesRenderer):
* html/HTMLTextFormControlElement.cpp:
(WebCore::stripTrailingNewline):
(WebCore::innerTextValueFrom):
(WebCore::HTMLTextFormControlElement::setInnerTextValue):
(WebCore::HTMLTextFormControlElement::innerTextValue):
(WebCore::HTMLTextFormControlElement::valueWithHardLineBreaks):
(WebCore::finishText): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementh">trunk/Source/WebCore/html/HTMLFormControlElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTextFormControlElementcpp">trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176029 => 176030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-12 19:34:45 UTC (rev 176029)
+++ trunk/Source/WebCore/ChangeLog 2014-11-12 20:07:54 UTC (rev 176030)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-11-12 Chris Dumez <cdumez@apple.com>
+
+ Speed up HTMLTextFormControlElement::setInnerTextValue() a bit
+ https://bugs.webkit.org/show_bug.cgi?id=138619
+
+ Reviewed by Darin Adler.
+
+ Speed up HTMLTextFormControlElement::setInnerTextValue() a bit by:
+ - Not doing a virtual isTextFormControl() call. Relying on innerTextElement()
+ not returning null is sufficient.
+ - Caching the result of innerTextElement() instead of repeatedly calling that
+ virtual function.
+ - De-virtualizing setFormControlValueMatchesRenderer() /
+ formControlValueMatchesRenderer() as these are never overridden.
+ - Moving the code constructing the innerTextValue from a
+ TextControlInnerTextElement from innerTextValue() to a new
+ innerTextValueFrom(TextControlInnerTextElement&) function and call this new
+ function from setInnerTextValue() to avoid calling innerTextElement() again
+ and making sure it is non-null
+ - Do the tree traversal from innerTextElement's firstChild instead of from
+ innerTextElement. The innerTextElement is a TextControlInnerTextElement.
+ Therefore, it cannot be an HTMLBRElement or a Text node.
+
+ No new tests, no behavior change.
+
+ * html/HTMLFormControlElement.h:
+ (WebCore::HTMLFormControlElement::formControlValueMatchesRenderer):
+ (WebCore::HTMLFormControlElement::setFormControlValueMatchesRenderer):
+ * html/HTMLTextFormControlElement.cpp:
+ (WebCore::stripTrailingNewline):
+ (WebCore::innerTextValueFrom):
+ (WebCore::HTMLTextFormControlElement::setInnerTextValue):
+ (WebCore::HTMLTextFormControlElement::innerTextValue):
+ (WebCore::HTMLTextFormControlElement::valueWithHardLineBreaks):
+ (WebCore::finishText): Deleted.
+
</ins><span class="cx"> 2014-11-12 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] media/track/audio-track.html is flakey
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.h (176029 => 176030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.h 2014-11-12 19:34:45 UTC (rev 176029)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.h 2014-11-12 20:07:54 UTC (rev 176030)
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void reset() { }
</span><span class="cx">
</span><del>- virtual bool formControlValueMatchesRenderer() const { return m_valueMatchesRenderer; }
- virtual void setFormControlValueMatchesRenderer(bool b) { m_valueMatchesRenderer = b; }
</del><ins>+ bool formControlValueMatchesRenderer() const { return m_valueMatchesRenderer; }
+ void setFormControlValueMatchesRenderer(bool b) { m_valueMatchesRenderer = b; }
</ins><span class="cx">
</span><span class="cx"> bool wasChangedSinceLastFormControlChangeEvent() const { return m_wasChangedSinceLastFormControlChangeEvent; }
</span><span class="cx"> void setChangedSinceLastFormControlChangeEvent(bool);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTextFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp (176029 => 176030)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2014-11-12 19:34:45 UTC (rev 176029)
+++ trunk/Source/WebCore/html/HTMLTextFormControlElement.cpp 2014-11-12 20:07:54 UTC (rev 176030)
</span><span class="lines">@@ -521,52 +521,53 @@
</span><span class="cx"> return m_lastChangeWasUserEdit;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void stripTrailingNewline(StringBuilder& result)
+{
+ // Remove one trailing newline; there's always one that's collapsed out by rendering.
+ size_t size = result.length();
+ if (size && result[size - 1] == newlineCharacter)
+ result.resize(size - 1);
+}
+
+static String innerTextValueFrom(TextControlInnerTextElement& innerText)
+{
+ StringBuilder result;
+ for (Node* node = innerText.firstChild(); node; node = NodeTraversal::next(node, &innerText)) {
+ if (is<HTMLBRElement>(*node))
+ result.append(newlineCharacter);
+ else if (is<Text>(*node))
+ result.append(downcast<Text>(*node).data());
+ }
+ stripTrailingNewline(result);
+ return result.toString();
+}
+
</ins><span class="cx"> void HTMLTextFormControlElement::setInnerTextValue(const String& value)
</span><span class="cx"> {
</span><del>- if (!isTextFormControl())
</del><ins>+ TextControlInnerTextElement* innerText = innerTextElement();
+ if (!innerText)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- bool textIsChanged = value != innerTextValue();
- if (textIsChanged || !innerTextElement()->hasChildNodes()) {
</del><ins>+ ASSERT(isTextFormControl());
+ bool textIsChanged = value != innerTextValueFrom(*innerText);
+ if (textIsChanged || !innerText->hasChildNodes()) {
</ins><span class="cx"> if (textIsChanged && renderer()) {
</span><span class="cx"> if (AXObjectCache* cache = document().existingAXObjectCache())
</span><span class="cx"> cache->postNotification(this, AXObjectCache::AXValueChanged, TargetObservableParent);
</span><span class="cx"> }
</span><del>- innerTextElement()->setInnerText(value, ASSERT_NO_EXCEPTION);
</del><ins>+ innerText->setInnerText(value, ASSERT_NO_EXCEPTION);
</ins><span class="cx">
</span><span class="cx"> if (value.endsWith('\n') || value.endsWith('\r'))
</span><del>- innerTextElement()->appendChild(HTMLBRElement::create(document()), ASSERT_NO_EXCEPTION);
</del><ins>+ innerText->appendChild(HTMLBRElement::create(document()), ASSERT_NO_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> setFormControlValueMatchesRenderer(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String finishText(StringBuilder& result)
-{
- // Remove one trailing newline; there's always one that's collapsed out by rendering.
- size_t size = result.length();
- if (size && result[size - 1] == newlineCharacter)
- result.resize(--size);
- return result.toString();
-}
-
</del><span class="cx"> String HTMLTextFormControlElement::innerTextValue() const
</span><span class="cx"> {
</span><del>- if (!isTextFormControl())
- return emptyString();
-
</del><span class="cx"> TextControlInnerTextElement* innerText = innerTextElement();
</span><del>- if (!innerText)
- return emptyString();
-
- StringBuilder result;
- for (Node* node = innerText; node; node = NodeTraversal::next(node, innerText)) {
- if (is<HTMLBRElement>(*node))
- result.append(newlineCharacter);
- else if (is<Text>(*node))
- result.append(downcast<Text>(*node).data());
- }
- return finishText(result);
</del><ins>+ return innerText ? innerTextValueFrom(*innerText) : emptyString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Position positionForIndex(TextControlInnerTextElement* innerText, unsigned index)
</span><span class="lines">@@ -704,7 +705,8 @@
</span><span class="cx"> while (breakNode == node)
</span><span class="cx"> getNextSoftBreak(line, breakNode, breakOffset);
</span><span class="cx"> }
</span><del>- return finishText(result);
</del><ins>+ stripTrailingNewline(result);
+ return result.toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HTMLTextFormControlElement* enclosingTextFormControl(const Position& position)
</span></span></pre>
</div>
</div>
</body>
</html>