<!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>[166615] 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/166615">166615</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-04-01 14:57:15 -0700 (Tue, 01 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate HTMLFormElement::m_shouldSubmit
https://bugs.webkit.org/show_bug.cgi?id=131055
Reviewed by Tim Horton.
m_shouldSubmit was used for two purposes:
- as a return value in a function whose return value is ignored by all callers;
- to make a decision that's local to a function.
There is no need for it to be an instance variable.
* html/HTMLFormElement.cpp:
(WebCore::HTMLFormElement::HTMLFormElement):
(WebCore::HTMLFormElement::prepareForSubmission):
(WebCore::HTMLFormElement::submit):
* html/HTMLFormElement.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementcpp">trunk/Source/WebCore/html/HTMLFormElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFormElementh">trunk/Source/WebCore/html/HTMLFormElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166614 => 166615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-01 21:57:12 UTC (rev 166614)
+++ trunk/Source/WebCore/ChangeLog 2014-04-01 21:57:15 UTC (rev 166615)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-04-01 Alexey Proskuryakov <ap@apple.com>
+
+ Eliminate HTMLFormElement::m_shouldSubmit
+ https://bugs.webkit.org/show_bug.cgi?id=131055
+
+ Reviewed by Tim Horton.
+
+ m_shouldSubmit was used for two purposes:
+ - as a return value in a function whose return value is ignored by all callers;
+ - to make a decision that's local to a function.
+
+ There is no need for it to be an instance variable.
+
+ * html/HTMLFormElement.cpp:
+ (WebCore::HTMLFormElement::HTMLFormElement):
+ (WebCore::HTMLFormElement::prepareForSubmission):
+ (WebCore::HTMLFormElement::submit):
+ * html/HTMLFormElement.h:
+
</ins><span class="cx"> 2014-04-01 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove a couple of useless static strings
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.cpp (166614 => 166615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-04-01 21:57:12 UTC (rev 166614)
+++ trunk/Source/WebCore/html/HTMLFormElement.cpp 2014-04-01 21:57:15 UTC (rev 166615)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> , m_associatedElementsAfterIndex(0)
</span><span class="cx"> , m_wasUserSubmitted(false)
</span><span class="cx"> , m_isSubmittingOrPreparingForSubmission(false)
</span><del>- , m_shouldSubmit(false)
</del><span class="cx"> , m_isInResetFunction(false)
</span><span class="cx"> , m_wasDemoted(false)
</span><span class="cx"> {
</span><span class="lines">@@ -260,19 +259,19 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLFormElement::prepareForSubmission(Event* event)
</del><ins>+void HTMLFormElement::prepareForSubmission(Event* event)
</ins><span class="cx"> {
</span><span class="cx"> Frame* frame = document().frame();
</span><span class="cx"> if (m_isSubmittingOrPreparingForSubmission || !frame)
</span><del>- return m_isSubmittingOrPreparingForSubmission;
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> m_isSubmittingOrPreparingForSubmission = true;
</span><del>- m_shouldSubmit = false;
</del><ins>+ bool shouldSubmit = false;
</ins><span class="cx">
</span><span class="cx"> // Interactive validation must be done before dispatching the submit event.
</span><span class="cx"> if (!validateInteractively(event)) {
</span><span class="cx"> m_isSubmittingOrPreparingForSubmission = false;
</span><del>- return false;
</del><ins>+ return;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StringPairVector controlNamesAndValues;
</span><span class="lines">@@ -281,14 +280,12 @@
</span><span class="cx"> frame->loader().client().dispatchWillSendSubmitEvent(formState.release());
</span><span class="cx">
</span><span class="cx"> if (dispatchEvent(Event::create(eventNames().submitEvent, true, true)))
</span><del>- m_shouldSubmit = true;
</del><ins>+ shouldSubmit = true;
</ins><span class="cx">
</span><span class="cx"> m_isSubmittingOrPreparingForSubmission = false;
</span><span class="cx">
</span><del>- if (m_shouldSubmit)
</del><ins>+ if (shouldSubmit)
</ins><span class="cx"> submit(event, true, true, NotSubmittedByJavaScript);
</span><del>-
- return m_shouldSubmit;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLFormElement::submit()
</span><span class="lines">@@ -325,10 +322,8 @@
</span><span class="cx"> if (!view || !frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_isSubmittingOrPreparingForSubmission) {
- m_shouldSubmit = true;
</del><ins>+ if (m_isSubmittingOrPreparingForSubmission)
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><span class="cx"> m_isSubmittingOrPreparingForSubmission = true;
</span><span class="cx"> m_wasUserSubmitted = processingUserGesture;
</span><span class="lines">@@ -358,7 +353,6 @@
</span><span class="cx"> if (needButtonActivation && firstSuccessfulSubmitButton)
</span><span class="cx"> firstSuccessfulSubmitButton->setActivatedSubmit(false);
</span><span class="cx">
</span><del>- m_shouldSubmit = false;
</del><span class="cx"> m_isSubmittingOrPreparingForSubmission = false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFormElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFormElement.h (166614 => 166615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFormElement.h 2014-04-01 21:57:12 UTC (rev 166614)
+++ trunk/Source/WebCore/html/HTMLFormElement.h 2014-04-01 21:57:15 UTC (rev 166615)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> void registerImgElement(HTMLImageElement*);
</span><span class="cx"> void removeImgElement(HTMLImageElement*);
</span><span class="cx">
</span><del>- bool prepareForSubmission(Event*);
</del><ins>+ void prepareForSubmission(Event*); // FIXME: This function doesn't only prepare, it sometimes calls sumbit() itself.
</ins><span class="cx"> void submit();
</span><span class="cx"> void submitFromJavaScript();
</span><span class="cx"> void reset();
</span><span class="lines">@@ -172,7 +172,6 @@
</span><span class="cx">
</span><span class="cx"> bool m_wasUserSubmitted;
</span><span class="cx"> bool m_isSubmittingOrPreparingForSubmission;
</span><del>- bool m_shouldSubmit;
</del><span class="cx">
</span><span class="cx"> bool m_isInResetFunction;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>