<!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>[42426] trunk</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/42426">42426</a></dd>
<dt>Author</dt> <dd>adele@apple.com</dd>
<dt>Date</dt> <dd>2009-04-12 09:24:02 -0700 (Sun, 12 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebCore:

2009-04-12  Adele Peterson  &lt;adele@apple.com&gt;

        Reviewed by Darin Adler.

        Test: editing/inserting/6609479-1.html

        Follow-up to &lt;rdar://problem/6609479&gt;.

        Before my last change, a Mail blockquote would've been broken up earlier, and you would've been guaranteed that the inserted content
        was at the start of a paragraph.  Now we need to check for that explicitly, and only merge the start of the inserted content if it is 
        at the start of a paragraph.

        * editing/ReplaceSelectionCommand.cpp: (WebCore::ReplaceSelectionCommand::shouldMergeStart):

LayoutTests:

2009-04-12  Adele Peterson  &lt;adele@apple.com&gt;

        Reviewed by Darin Adler.

        Another test for &lt;rdar://problem/6609479&gt;.  This covers inserting HTML in a quoted table.

        * editing/inserting/6609479-1-expected.txt: Added.
        * editing/inserting/6609479-1.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreeditingReplaceSelectionCommandcpp">trunk/WebCore/editing/ReplaceSelectionCommand.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditinginserting66094791expectedtxt">trunk/LayoutTests/editing/inserting/6609479-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditinginserting66094791html">trunk/LayoutTests/editing/inserting/6609479-1.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (42425 => 42426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-04-12 05:49:44 UTC (rev 42425)
+++ trunk/LayoutTests/ChangeLog        2009-04-12 16:24:02 UTC (rev 42426)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2009-04-12  Adele Peterson  &lt;adele@apple.com&gt;
+
+        Reviewed by Darin Adler.
+
+        Another test for &lt;rdar://problem/6609479&gt;.  This covers inserting HTML in a quoted table.
+
+        * editing/inserting/6609479-1-expected.txt: Added.
+        * editing/inserting/6609479-1.html: Added.
+
</ins><span class="cx"> 2009-04-11  Adele Peterson  &lt;adele@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dan Bernstein.
</span></span></pre></div>
<a id="trunkLayoutTestseditinginserting66094791expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/inserting/6609479-1-expected.txt (0 => 42426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/inserting/6609479-1-expected.txt                                (rev 0)
+++ trunk/LayoutTests/editing/inserting/6609479-1-expected.txt        2009-04-12 16:24:02 UTC (rev 42426)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+This tests that inserting html inside a table still works and doesn't break the table apart, even when in quoted content.
+
+foobarbaz
+Test Passed
+
</ins></span></pre></div>
<a id="trunkLayoutTestseditinginserting66094791html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/inserting/6609479-1.html (0 => 42426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/inserting/6609479-1.html                                (rev 0)
+++ trunk/LayoutTests/editing/inserting/6609479-1.html        2009-04-12 16:24:02 UTC (rev 42426)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+&lt;html&gt;
+    &lt;head&gt;
+        &lt;script&gt;
+            function log(msg)
+            {
+                document.getElementById('console').appendChild(document.createTextNode(msg + '\n'));
+            }
+            
+            function test()
+            {
+                if (window.layoutTestController)
+                    layoutTestController.dumpAsText();
+                var td = document.getElementById(&quot;td&quot;);
+                var text = td.firstChild;
+                var s = window.getSelection();
+                s.setBaseAndExtent(text, 3, text, 4);
+                document.execCommand(&quot;InsertHTML&quot;, true, &quot;bar&quot;);
+                var tables = document.getElementsByTagName(&quot;table&quot;); 
+                if (tables.length == 1)
+                    log(&quot;Test Passed&quot;);
+                else
+                    log (&quot;Test Failed&quot;);
+            }
+        &lt;/script&gt;
+    &lt;/head&gt;
+    &lt;body onload=&quot;test()&quot;&gt;
+        &lt;p&gt;This tests that inserting html inside a table still works and doesn't break the table apart, even when in quoted content.&lt;/p&gt;
+        &lt;div contenteditable=&quot;true&quot;&gt;
+            &lt;blockquote type=&quot;cite&quot;&gt;&lt;table border=&quot;1&quot; id=&quot;tb&quot;&gt;&lt;tr&gt;&lt;td id=&quot;td&quot;&gt;foo baz&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/blockquote&gt;
+        &lt;/div&gt;
+        &lt;pre id=&quot;console&quot;&gt;&lt;/pre&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (42425 => 42426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-04-12 05:49:44 UTC (rev 42425)
+++ trunk/WebCore/ChangeLog        2009-04-12 16:24:02 UTC (rev 42426)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2009-04-12  Adele Peterson  &lt;adele@apple.com&gt;
+
+        Reviewed by Darin Adler.
+
+        Test: editing/inserting/6609479-1.html
+
+        Follow-up to &lt;rdar://problem/6609479&gt;.
+
+        Before my last change, a Mail blockquote would've been broken up earlier, and you would've been guaranteed that the inserted content
+        was at the start of a paragraph.  Now we need to check for that explicitly, and only merge the start of the inserted content if it is 
+        at the start of a paragraph.
+
+        * editing/ReplaceSelectionCommand.cpp: (WebCore::ReplaceSelectionCommand::shouldMergeStart):
+
</ins><span class="cx"> 2009-04-11  Adele Peterson  &lt;adele@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dan Bernstein.
</span></span></pre></div>
<a id="trunkWebCoreeditingReplaceSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/editing/ReplaceSelectionCommand.cpp (42425 => 42426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/editing/ReplaceSelectionCommand.cpp        2009-04-12 05:49:44 UTC (rev 42425)
+++ trunk/WebCore/editing/ReplaceSelectionCommand.cpp        2009-04-12 16:24:02 UTC (rev 42426)
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx">     if (prev.isNull())
</span><span class="cx">         return false;
</span><span class="cx">     
</span><del>-    if (!m_movingParagraph &amp;&amp; hasMatchingQuoteLevel(prev, positionAtEndOfInsertedContent()))
</del><ins>+    if (!m_movingParagraph &amp;&amp; isStartOfParagraph(startOfInsertedContent) &amp;&amp; hasMatchingQuoteLevel(prev, positionAtEndOfInsertedContent()))
</ins><span class="cx">         return true;
</span><span class="cx"> 
</span><span class="cx">     return !selectionStartWasStartOfParagraph &amp;&amp; 
</span></span></pre>
</div>
</div>

</body>
</html>