<!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>[175787] 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/175787">175787</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-08 21:46:59 -0800 (Sat, 08 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move isEmptyValue() logic from HTMLInputElement to TextFieldInputType
https://bugs.webkit.org/show_bug.cgi?id=138538
Reviewed by Darin Adler.
Move isEmptyValue() logic from HTMLInputElement to TextFieldInputType
as this only makes sense for text field input types.
No new tests, no behavior change.
* html/HTMLInputElement.cpp:
(WebCore::HTMLInputElement::isEmptyValue):
* html/InputType.cpp:
(WebCore::InputType::isEmptyValue):
* html/InputType.h:
* html/TextFieldInputType.cpp:
(WebCore::TextFieldInputType::isEmptyValue):
* html/TextFieldInputType.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLInputElementcpp">trunk/Source/WebCore/html/HTMLInputElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlInputTypecpp">trunk/Source/WebCore/html/InputType.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlInputTypeh">trunk/Source/WebCore/html/InputType.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175786 => 175787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-09 03:21:13 UTC (rev 175786)
+++ trunk/Source/WebCore/ChangeLog 2014-11-09 05:46:59 UTC (rev 175787)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-11-08 Chris Dumez <cdumez@apple.com>
+
+ Move isEmptyValue() logic from HTMLInputElement to TextFieldInputType
+ https://bugs.webkit.org/show_bug.cgi?id=138538
+
+ Reviewed by Darin Adler.
+
+ Move isEmptyValue() logic from HTMLInputElement to TextFieldInputType
+ as this only makes sense for text field input types.
+
+ No new tests, no behavior change.
+
+ * html/HTMLInputElement.cpp:
+ (WebCore::HTMLInputElement::isEmptyValue):
+ * html/InputType.cpp:
+ (WebCore::InputType::isEmptyValue):
+ * html/InputType.h:
+ * html/TextFieldInputType.cpp:
+ (WebCore::TextFieldInputType::isEmptyValue):
+ * html/TextFieldInputType.h:
+
</ins><span class="cx"> 2014-11-08 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Replace FileThread class with a single function
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLInputElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLInputElement.cpp (175786 => 175787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-11-09 03:21:13 UTC (rev 175786)
+++ trunk/Source/WebCore/html/HTMLInputElement.cpp 2014-11-09 05:46:59 UTC (rev 175787)
</span><span class="lines">@@ -62,8 +62,6 @@
</span><span class="cx"> #include "SearchInputType.h"
</span><span class="cx"> #include "StyleResolver.h"
</span><span class="cx"> #include "TextBreakIterator.h"
</span><del>-#include "TextControlInnerElements.h"
-#include "TextNodeTraversal.h"
</del><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx">
</span><span class="lines">@@ -1680,17 +1678,7 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLInputElement::isEmptyValue() const
</span><span class="cx"> {
</span><del>- if (!isTextField())
- return true;
-
- TextControlInnerTextElement* innerText = innerTextElement();
- ASSERT(innerText);
-
- for (Text* text = TextNodeTraversal::firstWithin(innerText); text; text = TextNodeTraversal::next(text, innerText)) {
- if (text->length())
- return false;
- }
- return true;
</del><ins>+ return m_inputType->isEmptyValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLInputElement::parseMaxLengthAttribute(const AtomicString& value)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/InputType.cpp (175786 => 175787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/InputType.cpp 2014-11-09 03:21:13 UTC (rev 175786)
+++ trunk/Source/WebCore/html/InputType.cpp 2014-11-09 05:46:59 UTC (rev 175787)
</span><span class="lines">@@ -717,6 +717,11 @@
</span><span class="cx"> return element().value();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool InputType::isEmptyValue() const
+{
+ return true;
+}
+
</ins><span class="cx"> String InputType::sanitizeValue(const String& proposedValue) const
</span><span class="cx"> {
</span><span class="cx"> return proposedValue;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/InputType.h (175786 => 175787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/InputType.h 2014-11-09 03:21:13 UTC (rev 175786)
+++ trunk/Source/WebCore/html/InputType.h 2014-11-09 05:46:59 UTC (rev 175787)
</span><span class="lines">@@ -174,6 +174,7 @@
</span><span class="cx"> virtual bool canSetStringValue() const;
</span><span class="cx"> virtual String localizeValue(const String&) const;
</span><span class="cx"> virtual String visibleValue() const;
</span><ins>+ virtual bool isEmptyValue() const;
</ins><span class="cx"> // Returing the null string means "use the default value."
</span><span class="cx"> // This function must be called only by HTMLInputElement::sanitizeValue().
</span><span class="cx"> virtual String sanitizeValue(const String&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTextFieldInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (175786 => 175787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2014-11-09 03:21:13 UTC (rev 175786)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2014-11-09 05:46:59 UTC (rev 175787)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #include "TextControlInnerElements.h"
</span><span class="cx"> #include "TextEvent.h"
</span><span class="cx"> #include "TextIterator.h"
</span><ins>+#include "TextNodeTraversal.h"
</ins><span class="cx"> #include "WheelEvent.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -87,6 +88,18 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool TextFieldInputType::isEmptyValue() const
+{
+ TextControlInnerTextElement* innerText = innerTextElement();
+ ASSERT(innerText);
+
+ for (Text* text = TextNodeTraversal::firstWithin(innerText); text; text = TextNodeTraversal::next(text, innerText)) {
+ if (text->length())
+ return false;
+ }
+ return true;
+}
+
</ins><span class="cx"> bool TextFieldInputType::valueMissing(const String& value) const
</span><span class="cx"> {
</span><span class="cx"> return element().isRequired() && value.isEmpty();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTextFieldInputTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextFieldInputType.h (175786 => 175787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextFieldInputType.h 2014-11-09 03:21:13 UTC (rev 175786)
+++ trunk/Source/WebCore/html/TextFieldInputType.h 2014-11-09 05:46:59 UTC (rev 175787)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> virtual bool isKeyboardFocusable(KeyboardEvent*) const override final;
</span><span class="cx"> virtual bool isMouseFocusable() const override final;
</span><span class="cx"> virtual bool isTextField() const override final;
</span><ins>+ virtual bool isEmptyValue() const override final;
</ins><span class="cx"> virtual bool valueMissing(const String&) const override final;
</span><span class="cx"> virtual void handleBeforeTextInsertedEvent(BeforeTextInsertedEvent*) override final;
</span><span class="cx"> virtual void forwardEvent(Event*) override final;
</span></span></pre>
</div>
</div>
</body>
</html>