<!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>[210333] branches/safari-603-branch</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/210333">210333</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-05 09:08:27 -0800 (Thu, 05 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/209990">r209990</a>. rdar://problem/29705967</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCorehtmlHTMLFormElementcpp">branches/safari-603-branch/Source/WebCore/html/HTMLFormElement.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorehtmlHTMLFormElementh">branches/safari-603-branch/Source/WebCore/html/HTMLFormElement.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsfasthtmlformmutateexpectedtxt">branches/safari-603-branch/LayoutTests/fast/html/form-mutate-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsfasthtmlformmutatehtml">branches/safari-603-branch/LayoutTests/fast/html/form-mutate.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (210332 => 210333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-05 17:08:24 UTC (rev 210332)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-05 17:08:27 UTC (rev 210333)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-01-04 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r209990. rdar://problem/29705967
+
+ 2016-12-18 Brent Fulgham <bfulgham@apple.com>
+
+ Side effects while restting form elements
+ https://bugs.webkit.org/show_bug.cgi?id=165959
+ <rdar://problem/29705967>
+
+ Reviewed by Anders Carlsson.
+
+ * fast/html/form-mutate-expected.txt: Added.
+ * fast/html/form-mutate.html: Added.
+
</ins><span class="cx"> 2017-01-04 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed test gardening.
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsfasthtmlformmutateexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/html/form-mutate-expected.txt (0 => 210333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/html/form-mutate-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/html/form-mutate-expected.txt 2017-01-05 17:08:27 UTC (rev 210333)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+PASS Passes if we do not crash.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsfasthtmlformmutatehtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/fast/html/form-mutate.html (0 => 210333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/fast/html/form-mutate.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/fast/html/form-mutate.html 2017-01-05 17:08:27 UTC (rev 210333)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test.js"></script>
+<script>
+window.jsTestIsAsync = true;
+
+function runTest() {
+ output.value = "test value";
+ output.appendChild(inserted_div);
+
+ document.getElementById("output").addEventListener('DOMSubtreeModified', function() {
+ for(var i=0; i<20; i++) {
+ form.appendChild(document.createElement("input"));
+ }
+ }, false);
+
+ form.reset();
+ setTimeout(function() {
+ testPassed("Passes if we do not crash.");
+ finishJSTest();
+ }, 0);
+}
+</script>
+</head>
+<body onload="runTest()">
+ <div id="inserted_div">foo</div>
+ <form id="form" onchange="eventhandler()">
+ <input type="text" value="foo">
+ <output id="output" oninput="eventhandler()"></output>
+ <input type="text" value="foo">
+ </form>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210332 => 210333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 17:08:24 UTC (rev 210332)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-05 17:08:27 UTC (rev 210333)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2017-01-04 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r209990. rdar://problem/29705967
+
+ 2016-12-18 Brent Fulgham <bfulgham@apple.com>
+
+ Side effects while restting form elements
+ https://bugs.webkit.org/show_bug.cgi?id=165959
+ <rdar://problem/29705967>
+
+ Reviewed by Anders Carlsson.
+
+ JavaScript logic can run while resetting FormElement objects. This can
+ lead to unintended side-effets and other unwanted behavior. We should
+ protect these elements during the reset.
+
+ Test: fast/html/form-mutate.html
+
+ * html/HTMLFormElement.cpp:
+ (WebCore::HTMLFormElement::HTMLFormElement): Switch to C++11 initialization.
+ (WebCore::HTMLFormElement::reset): Protect elements until the reset
+ operation is finished.
+ (WebCore::HTMLFormElement::resetAssociatedFormControlElements): Added to share
+ code with 'resumeFromDocument'.
+ (WebCore::HTMLFormElement::resumeFromDocument): Protect elements until the
+ reset operation is finished.
+
+2017-01-04 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210045. rdar://problem/29560853
</span><span class="cx">
</span><span class="cx"> 2016-12-20 Alex Christensen <achristensen@webkit.org>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehtmlHTMLFormElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/html/HTMLFormElement.cpp (210332 => 210333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/html/HTMLFormElement.cpp 2017-01-05 17:08:24 UTC (rev 210332)
+++ branches/safari-603-branch/Source/WebCore/html/HTMLFormElement.cpp 2017-01-05 17:08:27 UTC (rev 210333)
</span><span class="lines">@@ -2,7 +2,7 @@
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2001 Dirk Mueller (mueller@kde.org)
</span><del>- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004-2010, 2012-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include <limits>
</span><span class="cx"> #include <wtf/Ref.h>
</span><ins>+#include <wtf/SetForScope.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -58,13 +59,6 @@
</span><span class="cx">
</span><span class="cx"> HTMLFormElement::HTMLFormElement(const QualifiedName& tagName, Document& document)
</span><span class="cx"> : HTMLElement(tagName, document)
</span><del>- , m_associatedElementsBeforeIndex(0)
- , m_associatedElementsAfterIndex(0)
- , m_wasUserSubmitted(false)
- , m_isSubmittingOrPreparingForSubmission(false)
- , m_shouldSubmit(false)
- , m_isInResetFunction(false)
- , m_wasDemoted(false)
</del><span class="cx"> #if ENABLE(REQUEST_AUTOCOMPLETE)
</span><span class="cx"> , m_requestAutocompletetimer(*this, &HTMLFormElement::requestAutocompleteTimerFired)
</span><span class="cx"> #endif
</span><span class="lines">@@ -367,19 +361,30 @@
</span><span class="cx"> if (m_isInResetFunction || !frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_isInResetFunction = true;
</del><ins>+ Ref<HTMLFormElement> protectedThis(*this);
</ins><span class="cx">
</span><del>- if (!dispatchEvent(Event::create(eventNames().resetEvent, true, true))) {
- m_isInResetFunction = false;
</del><ins>+ SetForScope<bool> isInResetFunctionRestorer(m_isInResetFunction, true);
+
+ if (!dispatchEvent(Event::create(eventNames().resetEvent, true, true)))
</ins><span class="cx"> return;
</span><del>- }
</del><span class="cx">
</span><del>- for (auto& associatedElement : m_associatedElements) {
- if (is<HTMLFormControlElement>(*associatedElement))
- downcast<HTMLFormControlElement>(*associatedElement).reset();
</del><ins>+ resetAssociatedFormControlElements();
+}
+
+void HTMLFormElement::resetAssociatedFormControlElements()
+{
+ // Event handling can cause associated elements to be added or deleted while iterating
+ // over this collection. Protect these elements until we are done notifying them of
+ // the reset operation.
+ Vector<Ref<HTMLFormControlElement>> associatedFormControlElements;
+ associatedFormControlElements.reserveInitialCapacity(m_associatedElements.size());
+ for (auto* element : m_associatedElements) {
+ if (is<HTMLFormControlElement>(element))
+ associatedFormControlElements.uncheckedAppend(*downcast<HTMLFormControlElement>(element));
</ins><span class="cx"> }
</span><del>-
- m_isInResetFunction = false;
</del><ins>+
+ for (auto& associatedFormControlElement : associatedFormControlElements)
+ associatedFormControlElement->reset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(IOS_AUTOCORRECT_AND_AUTOCAPITALIZE)
</span><span class="lines">@@ -837,10 +842,9 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!shouldAutocomplete());
</span><span class="cx">
</span><del>- for (auto& associatedElement : m_associatedElements) {
- if (is<HTMLFormControlElement>(*associatedElement))
- downcast<HTMLFormControlElement>(*associatedElement).reset();
- }
</del><ins>+ Ref<HTMLFormElement> protectedThis(*this);
+
+ resetAssociatedFormControlElements();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLFormElement::didMoveToNewDocument(Document& oldDocument)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorehtmlHTMLFormElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/html/HTMLFormElement.h (210332 => 210333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/html/HTMLFormElement.h 2017-01-05 17:08:24 UTC (rev 210332)
+++ branches/safari-603-branch/Source/WebCore/html/HTMLFormElement.h 2017-01-05 17:08:27 UTC (rev 210333)
</span><span class="lines">@@ -169,6 +169,8 @@
</span><span class="cx"> bool matchesValidPseudoClass() const final;
</span><span class="cx"> bool matchesInvalidPseudoClass() const final;
</span><span class="cx">
</span><ins>+ void resetAssociatedFormControlElements();
+
</ins><span class="cx"> typedef HashMap<RefPtr<AtomicStringImpl>, FormNamedItem*> PastNamesMap;
</span><span class="cx">
</span><span class="cx"> FormSubmission::Attributes m_attributes;
</span><span class="lines">@@ -177,19 +179,19 @@
</span><span class="cx"> RadioButtonGroups m_radioButtonGroups;
</span><span class="cx"> mutable HTMLFormControlElement* m_defaultButton { nullptr };
</span><span class="cx">
</span><del>- unsigned m_associatedElementsBeforeIndex;
- unsigned m_associatedElementsAfterIndex;
</del><ins>+ unsigned m_associatedElementsBeforeIndex { 0 };
+ unsigned m_associatedElementsAfterIndex { 0 };
</ins><span class="cx"> Vector<FormAssociatedElement*> m_associatedElements;
</span><span class="cx"> Vector<HTMLImageElement*> m_imageElements;
</span><span class="cx"> HashSet<const HTMLFormControlElement*> m_invalidAssociatedFormControls;
</span><span class="cx">
</span><del>- bool m_wasUserSubmitted;
- bool m_isSubmittingOrPreparingForSubmission;
- bool m_shouldSubmit;
</del><ins>+ bool m_wasUserSubmitted { false };
+ bool m_isSubmittingOrPreparingForSubmission { false };
+ bool m_shouldSubmit { false };
</ins><span class="cx">
</span><del>- bool m_isInResetFunction;
</del><ins>+ bool m_isInResetFunction { false };
</ins><span class="cx">
</span><del>- bool m_wasDemoted;
</del><ins>+ bool m_wasDemoted { false };
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(REQUEST_AUTOCOMPLETE)
</span><span class="cx"> void requestAutocompleteTimerFired();
</span></span></pre>
</div>
</div>
</body>
</html>