<!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>[208577] 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/208577">208577</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-11-10 20:32:41 -0800 (Thu, 10 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Speed up HTMLInputElement validation
https://bugs.webkit.org/show_bug.cgi?id=164603
Reviewed by Ryosuke Niwa.
Speed up HTMLInputElement validation by doing 1 virtual function call
instead of 9 and calling HTMLInputElement::value() only once per
validation instead of 9 times. Calling value() is expensive because
of sanitization.
No new tests, no Web-exposed behavior change.
* html/BaseCheckableInputType.cpp:
(WebCore::BaseCheckableInputType::fallbackValue):
* html/FormAssociatedElement.cpp:
(WebCore::FormAssociatedElement::isValid):
* html/FormAssociatedElement.h:
* html/HTMLFormControlElement.cpp:
(WebCore::HTMLFormControlElement::isValidFormControlElement):
(WebCore::HTMLFormControlElement::updateValidity):
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::isValid):
(WebCore::HTMLInputElement::value):
* html/HTMLInputElement.h:
* html/TextFieldInputType.cpp:
(WebCore::limitLength):
* html/ValidityState.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlBaseCheckableInputTypecpp">trunk/Source/WebCore/html/BaseCheckableInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlFormAssociatedElementcpp">trunk/Source/WebCore/html/FormAssociatedElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlFormAssociatedElementh">trunk/Source/WebCore/html/FormAssociatedElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormControlElementcpp">trunk/Source/WebCore/html/HTMLFormControlElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementh">trunk/Source/WebCore/html/HTMLInputElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlTextFieldInputTypecpp">trunk/Source/WebCore/html/TextFieldInputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlValidityStateidl">trunk/Source/WebCore/html/ValidityState.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208576 => 208577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-11 04:15:41 UTC (rev 208576)
+++ trunk/Source/WebCore/ChangeLog 2016-11-11 04:32:41 UTC (rev 208577)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-11-10 Chris Dumez <cdumez@apple.com>
+
+ Speed up HTMLInputElement validation
+ https://bugs.webkit.org/show_bug.cgi?id=164603
+
+ Reviewed by Ryosuke Niwa.
+
+ Speed up HTMLInputElement validation by doing 1 virtual function call
+ instead of 9 and calling HTMLInputElement::value() only once per
+ validation instead of 9 times. Calling value() is expensive because
+ of sanitization.
+
+ No new tests, no Web-exposed behavior change.
+
+ * html/BaseCheckableInputType.cpp:
+ (WebCore::BaseCheckableInputType::fallbackValue):
+ * html/FormAssociatedElement.cpp:
+ (WebCore::FormAssociatedElement::isValid):
+ * html/FormAssociatedElement.h:
+ * html/HTMLFormControlElement.cpp:
+ (WebCore::HTMLFormControlElement::isValidFormControlElement):
+ (WebCore::HTMLFormControlElement::updateValidity):
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::isValid):
+ (WebCore::HTMLInputElement::value):
+ * html/HTMLInputElement.h:
+ * html/TextFieldInputType.cpp:
+ (WebCore::limitLength):
+ * html/ValidityState.idl:
+
</ins><span class="cx"> 2016-11-10 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Add link information to data transfer pasteboard for drag and drop links
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlBaseCheckableInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/BaseCheckableInputType.cpp (208576 => 208577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/BaseCheckableInputType.cpp 2016-11-11 04:15:41 UTC (rev 208576)
+++ trunk/Source/WebCore/html/BaseCheckableInputType.cpp 2016-11-11 04:32:41 UTC (rev 208577)
</span><span class="lines">@@ -93,7 +93,8 @@
</span><span class="cx">
</span><span class="cx"> String BaseCheckableInputType::fallbackValue() const
</span><span class="cx"> {
</span><del>- return ASCIILiteral("on");
</del><ins>+ static NeverDestroyed<const AtomicString> on("on", AtomicString::ConstructFromLiteral);
+ return on.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool BaseCheckableInputType::storesValueSeparateFromAttribute()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlFormAssociatedElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/FormAssociatedElement.cpp (208576 => 208577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/FormAssociatedElement.cpp 2016-11-11 04:15:41 UTC (rev 208576)
+++ trunk/Source/WebCore/html/FormAssociatedElement.cpp 2016-11-11 04:32:41 UTC (rev 208577)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool FormAssociatedElement::valid() const
</del><ins>+bool FormAssociatedElement::isValid() const
</ins><span class="cx"> {
</span><span class="cx"> bool someError = typeMismatch() || stepMismatch() || rangeUnderflow() || rangeOverflow()
</span><span class="cx"> || tooShort() || tooLong() || patternMismatch() || valueMissing() || hasBadInput() || customError();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlFormAssociatedElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/FormAssociatedElement.h (208576 => 208577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/FormAssociatedElement.h 2016-11-11 04:15:41 UTC (rev 208576)
+++ trunk/Source/WebCore/html/FormAssociatedElement.h 2016-11-11 04:32:41 UTC (rev 208577)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> virtual bool typeMismatch() const;
</span><span class="cx"> virtual bool valueMissing() const;
</span><span class="cx"> virtual String validationMessage() const;
</span><del>- bool valid() const;
</del><ins>+ virtual bool isValid() const;
</ins><span class="cx"> virtual void setCustomValidity(const String&);
</span><span class="cx">
</span><span class="cx"> void formAttributeTargetChanged();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormControlElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormControlElement.cpp (208576 => 208577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2016-11-11 04:15:41 UTC (rev 208576)
+++ trunk/Source/WebCore/html/HTMLFormControlElement.cpp 2016-11-11 04:32:41 UTC (rev 208577)
</span><span class="lines">@@ -526,7 +526,7 @@
</span><span class="cx"> {
</span><span class="cx"> // If the following assertion fails, updateValidity() is not called
</span><span class="cx"> // correctly when something which changes validity is updated.
</span><del>- ASSERT(m_isValid == valid());
</del><ins>+ ASSERT(m_isValid == isValid());
</ins><span class="cx"> return m_isValid;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -551,7 +551,7 @@
</span><span class="cx"> bool willValidate = this->willValidate();
</span><span class="cx"> bool wasValid = m_isValid;
</span><span class="cx">
</span><del>- m_isValid = valid();
</del><ins>+ m_isValid = isValid();
</ins><span class="cx">
</span><span class="cx"> if (willValidate && m_isValid != wasValid) {
</span><span class="cx"> // Update style for pseudo classes such as :valid :invalid.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (208576 => 208577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-11-11 04:15:41 UTC (rev 208576)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2016-11-11 04:32:41 UTC (rev 208577)
</span><span class="lines">@@ -358,6 +358,18 @@
</span><span class="cx"> return willValidate() && m_inputType->stepMismatch(value());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool HTMLInputElement::isValid() const
+{
+ if (!willValidate())
+ return true;
+
+ String value = this->value();
+ bool someError = m_inputType->typeMismatch() || m_inputType->stepMismatch(value) || m_inputType->rangeUnderflow(value) || m_inputType->rangeOverflow(value)
+ || tooShort(value, CheckDirtyFlag) || tooLong(value, CheckDirtyFlag) || m_inputType->patternMismatch(value) || m_inputType->valueMissing(value)
+ || m_inputType->hasBadInput() || customError();
+ return !someError;
+}
+
</ins><span class="cx"> bool HTMLInputElement::getAllowedValueStep(Decimal* step) const
</span><span class="cx"> {
</span><span class="cx"> return m_inputType->getAllowedValueStep(step);
</span><span class="lines">@@ -979,7 +991,7 @@
</span><span class="cx"> if (!value.isNull())
</span><span class="cx"> return value;
</span><span class="cx">
</span><del>- AtomicString valueString = attributeWithoutSynchronization(valueAttr);
</del><ins>+ auto& valueString = attributeWithoutSynchronization(valueAttr);
</ins><span class="cx"> value = sanitizeValue(valueString);
</span><span class="cx"> if (!value.isNull())
</span><span class="cx"> return value;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.h (208576 => 208577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.h 2016-11-11 04:15:41 UTC (rev 208576)
+++ trunk/Source/WebCore/html/HTMLInputElement.h 2016-11-11 04:32:41 UTC (rev 208577)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> bool tooLong() const final;
</span><span class="cx"> bool typeMismatch() const final;
</span><span class="cx"> bool valueMissing() const final;
</span><ins>+ bool isValid() const final;
</ins><span class="cx"> WEBCORE_EXPORT String validationMessage() const final;
</span><span class="cx">
</span><span class="cx"> // Returns the minimum value for type=date, number, or range. Don't call this for other types.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTextFieldInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (208576 => 208577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2016-11-11 04:15:41 UTC (rev 208576)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2016-11-11 04:32:41 UTC (rev 208577)
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- return string.left(newLength);
</del><ins>+ return newLength < string.length() ? string.left(newLength) : string;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static String autoFillButtonTypeToAccessibilityLabel(AutoFillButtonType autoFillButtonType)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlValidityStateidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ValidityState.idl (208576 => 208577)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ValidityState.idl 2016-11-11 04:15:41 UTC (rev 208576)
+++ trunk/Source/WebCore/html/ValidityState.idl 2016-11-11 04:32:41 UTC (rev 208577)
</span><span class="lines">@@ -33,5 +33,5 @@
</span><span class="cx"> readonly attribute boolean stepMismatch;
</span><span class="cx"> readonly attribute boolean badInput;
</span><span class="cx"> readonly attribute boolean customError;
</span><del>- readonly attribute boolean valid;
</del><ins>+ [ImplementedAs=isValid] readonly attribute boolean valid;
</ins><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>