<!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>[212494] 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/212494">212494</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-16 16:56:14 -0800 (Thu, 16 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212151">r212151</a>. rdar://problem/30090186</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchPerformanceTestsChangeLog">branches/safari-603-branch/PerformanceTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreeditingDeleteSelectionCommandcpp">branches/safari-603-branch/Source/WebCore/editing/DeleteSelectionCommand.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoreeditingDeleteSelectionCommandh">branches/safari-603-branch/Source/WebCore/editing/DeleteSelectionCommand.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchPerformanceTestsDOMlargetableedithtml">branches/safari-603-branch/PerformanceTests/DOM/large-table-edit.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/PerformanceTests/ChangeLog (212493 => 212494)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/PerformanceTests/ChangeLog        2017-02-17 00:56:10 UTC (rev 212493)
+++ branches/safari-603-branch/PerformanceTests/ChangeLog        2017-02-17 00:56:14 UTC (rev 212494)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r212151. rdar://problem/30090186
+
+ 2017-02-10 Zalan Bujtas <zalan@apple.com>
+
+ Mail hangs when removing multiple rows from large table.
+ https://bugs.webkit.org/show_bug.cgi?id=168103
+ <rdar://problem/30090186>
+
+ Reviewed by Ryosuke Niwa.
+
+ * DOM/large-table-edit.html: Added.
+
</ins><span class="cx"> 2017-02-09 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211746. rdar://problem/30107622
</span></span></pre></div>
<a id="branchessafari603branchPerformanceTestsDOMlargetableedithtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/PerformanceTests/DOM/large-table-edit.html (0 => 212494)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/PerformanceTests/DOM/large-table-edit.html         (rev 0)
+++ branches/safari-603-branch/PerformanceTests/DOM/large-table-edit.html        2017-02-17 00:56:14 UTC (rev 212494)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../resources/runner.js"></script>
+</head>
+<body>
+<table id=table contenteditable="true">
+<tr><td><div id=start>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><
;div>22</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div>&
lt;/td><td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div id=end>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><d
iv>22</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div><
;/td><td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+<tr><td><div>1</div></td><td><div>2</div></td><td><div>3</div></td><td><div>4</div></td><td><div>5</div></td><td><div>6</div></td><td><div>7</div></td><td><div>8</div></td><td><div>9</div></td><td><div>10</div></td><td><div>11</div></td><td><div>12</div></td><td><div>13</div></td><td><div>14</div></td><td><div>15</div></td><td><div>16</div></td><td><div>17</div></td><td><div>18</div></td><td><div>19</div></td><td><div>20</div></td><td><div>21</div></td><td><div>2
2</div></td><td><div>23</div></td><td><div>24</div></td><td><div>25</div></td><td><div>26</div></td><td><div>27</div></td><td><div>28</div></td><td><div>29</div></td><td><div>30</div></td><td><div>31</div></td><td><div>32</div></td><td><div>33</div></td><td><div>34</div></td><td><div>35</div></td><td><div>36</div></td><td><div>37</div></td><td><div>38</div></td><td><div>39</div></td><td><div>40</div></td><td><div>41</div></td><td><div>42</div></td><td><div>43</div></td>
;<td><div>44</div></td><td><div>45</div></td><td><div>46</div></td><td><div>47</div></td><td><div>48</div></td><td><div>49</div></td><td><div>50</div></td></tr>
+</table>
+<script>
+var content = table.innerHTML;
+PerfTestRunner.measureRunsPerSecond({run: function() {
+ table.style.display = "table";
+ window.getSelection().removeAllRanges();
+
+ var range = document.createRange();
+ range.setStart(start, 0);
+ range.setEnd(end, 1);
+ window.getSelection().addRange(range);
+
+ document.execCommand("delete")
+
+ table.style.display = "none";
+ table.innerHTML = content;
+}});
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (212493 => 212494)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog        2017-02-17 00:56:10 UTC (rev 212493)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog        2017-02-17 00:56:14 UTC (rev 212494)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r212151. rdar://problem/30090186
+
+ 2017-02-10 Zalan Bujtas <zalan@apple.com>
+
+ Mail hangs when removing multiple rows from large table.
+ https://bugs.webkit.org/show_bug.cgi?id=168103
+ <rdar://problem/30090186>
+
+ Reviewed by Ryosuke Niwa.
+
+ DeleteSelectionCommand::removeNode doesn't actually destroy table structure items,
+ but instead it removes their content. In order to be able to continue editing the table after
+ the delete, we need to ensure that its cells' width and height are > 0. Currently we issue layout on
+ each table item recursively.
+ This patch delays the layout until after we've finished with the entire subtree delete (10x progression).
+
+ Performance test added.
+
+ * editing/DeleteSelectionCommand.cpp:
+ (WebCore::DeleteSelectionCommand::insertBlockPlaceholderForTableCellIfNeeded):
+ (WebCore::DeleteSelectionCommand::removeNodeUpdatingStates):
+ (WebCore::shouldRemoveContentOnly):
+ (WebCore::DeleteSelectionCommand::removeNode):
+ * editing/DeleteSelectionCommand.h:
+
+2017-02-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r211766. rdar://problem/30467124
</span><span class="cx">
</span><span class="cx"> 2017-02-06 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreeditingDeleteSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/editing/DeleteSelectionCommand.cpp (212493 => 212494)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/editing/DeleteSelectionCommand.cpp        2017-02-17 00:56:10 UTC (rev 212493)
+++ branches/safari-603-branch/Source/WebCore/editing/DeleteSelectionCommand.cpp        2017-02-17 00:56:14 UTC (rev 212494)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "DocumentMarkerController.h"
</span><span class="cx"> #include "Editor.h"
</span><span class="cx"> #include "EditorClient.h"
</span><ins>+#include "ElementIterator.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "HTMLBRElement.h"
</span><span class="cx"> #include "HTMLLinkElement.h"
</span><span class="lines">@@ -344,6 +345,37 @@
</span><span class="cx"> return next ? firstPositionInOrBeforeNode(next) : Position();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DeleteSelectionCommand::insertBlockPlaceholderForTableCellIfNeeded(Element& element)
+{
+ // Make sure empty cell has some height.
+ auto* renderer = element.renderer();
+ if (!is<RenderTableCell>(renderer))
+ return;
+ if (downcast<RenderTableCell>(*renderer).contentHeight() > 0)
+ return;
+ insertBlockPlaceholder(firstEditablePositionInNode(&element));
+}
+
+void DeleteSelectionCommand::removeNodeUpdatingStates(Node& node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable)
+{
+ if (&node == m_startBlock && !isEndOfBlock(VisiblePosition(firstPositionInNode(m_startBlock.get())).previous()))
+ m_needPlaceholder = true;
+ else if (&node == m_endBlock && !isStartOfBlock(VisiblePosition(lastPositionInNode(m_startBlock.get())).next()))
+ m_needPlaceholder = true;
+
+ // FIXME: Update the endpoints of the range being deleted.
+ updatePositionForNodeRemoval(m_endingPosition, node);
+ updatePositionForNodeRemoval(m_leadingWhitespace, node);
+ updatePositionForNodeRemoval(m_trailingWhitespace, node);
+
+ CompositeEditCommand::removeNode(&node, shouldAssumeContentIsAlwaysEditable);
+}
+
+static inline bool shouldRemoveContentOnly(const Node& node)
+{
+ return isTableStructureNode(&node) || node.isRootEditableElement();
+}
+
</ins><span class="cx"> void DeleteSelectionCommand::removeNode(PassRefPtr<Node> node, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable)
</span><span class="cx"> {
</span><span class="cx"> if (!node)
</span><span class="lines">@@ -371,38 +403,34 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (isTableStructureNode(node.get()) || node->isRootEditableElement()) {
</del><ins>+ if (shouldRemoveContentOnly(*node)) {
</ins><span class="cx"> // Do not remove an element of table structure; remove its contents.
</span><span class="cx"> // Likewise for the root editable element.
</span><del>- Node* child = node->firstChild();
</del><ins>+ auto* child = NodeTraversal::next(*node, node.get());
</ins><span class="cx"> while (child) {
</span><del>- Node* remove = child;
- child = child->nextSibling();
- removeNode(remove, shouldAssumeContentIsAlwaysEditable);
</del><ins>+ if (shouldRemoveContentOnly(*child)) {
+ child = NodeTraversal::next(*child, node.get());
+ continue;
+ }
+ auto* remove = child;
+ child = NodeTraversal::nextSkippingChildren(*child, node.get());
+ removeNodeUpdatingStates(*remove, shouldAssumeContentIsAlwaysEditable);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Make sure empty cell has some height, if a placeholder can be inserted.
</del><ins>+ ASSERT(is<Element>(*node));
+ auto& element = downcast<Element>(*node);
</ins><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><del>- RenderObject* renderer = node->renderer();
- if (is<RenderTableCell>(renderer) && downcast<RenderTableCell>(*renderer).contentHeight() <= 0) {
- Position firstEditablePosition = firstEditablePositionInNode(node.get());
- if (firstEditablePosition.isNotNull())
- insertBlockPlaceholder(firstEditablePosition);
</del><ins>+ // Check if we need to insert a placeholder for descendant table cells.
+ auto* descendant = ElementTraversal::next(element, &element);
+ while (descendant) {
+ auto* placeholderCandidate = descendant;
+ descendant = ElementTraversal::next(*descendant, &element);
+ insertBlockPlaceholderForTableCellIfNeeded(*placeholderCandidate);
</ins><span class="cx"> }
</span><ins>+ insertBlockPlaceholderForTableCellIfNeeded(element);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- if (node == m_startBlock && !isEndOfBlock(VisiblePosition(firstPositionInNode(m_startBlock.get())).previous()))
- m_needPlaceholder = true;
- else if (node == m_endBlock && !isStartOfBlock(VisiblePosition(lastPositionInNode(m_startBlock.get())).next()))
- m_needPlaceholder = true;
-
- // FIXME: Update the endpoints of the range being deleted.
- updatePositionForNodeRemoval(m_endingPosition, *node);
- updatePositionForNodeRemoval(m_leadingWhitespace, *node);
- updatePositionForNodeRemoval(m_trailingWhitespace, *node);
-
- CompositeEditCommand::removeNode(node, shouldAssumeContentIsAlwaysEditable);
</del><ins>+ removeNodeUpdatingStates(*node, shouldAssumeContentIsAlwaysEditable);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void updatePositionForTextRemoval(Node* node, int offset, int count, Position& position)
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreeditingDeleteSelectionCommandh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/editing/DeleteSelectionCommand.h (212493 => 212494)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/editing/DeleteSelectionCommand.h        2017-02-17 00:56:10 UTC (rev 212493)
+++ branches/safari-603-branch/Source/WebCore/editing/DeleteSelectionCommand.h        2017-02-17 00:56:14 UTC (rev 212494)
</span><span class="lines">@@ -73,6 +73,9 @@
</span><span class="cx"> // This function provides access to original string after the correction has been deleted.
</span><span class="cx"> String originalStringForAutocorrectionAtBeginningOfSelection();
</span><span class="cx">
</span><ins>+ void removeNodeUpdatingStates(Node&, ShouldAssumeContentIsAlwaysEditable);
+ void insertBlockPlaceholderForTableCellIfNeeded(Element&);
+
</ins><span class="cx"> bool m_hasSelectionToDelete;
</span><span class="cx"> bool m_smartDelete;
</span><span class="cx"> bool m_mergeBlocksAfterDelete;
</span></span></pre>
</div>
</div>
</body>
</html>