<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[31406] branches/Safari-3-1-branch/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/31406">31406</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2008-03-28 14:00:56 -0700 (Fri, 28 Mar 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge r31336.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesSafari31branchWebCoreChangeLog">branches/Safari-3-1-branch/WebCore/ChangeLog</a></li>
<li><a href="#branchesSafari31branchWebCoreeditingmarkupcpp">branches/Safari-3-1-branch/WebCore/editing/markup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesSafari31branchWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/Safari-3-1-branch/WebCore/ChangeLog (31405 => 31406)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-3-1-branch/WebCore/ChangeLog 2008-03-28 20:56:41 UTC (rev 31405)
+++ branches/Safari-3-1-branch/WebCore/ChangeLog 2008-03-28 21:00:56 UTC (rev 31406)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2008-03-28 Mark Rowe <mrowe@apple.com>
+
+ Merge r31336 to Safari-3-1-branch.
+
+ 2008-03-26 Justin Garcia <justin.garcia@apple.com>
+
+ Reviewed by Harrison.
+
+ <rdar://problem/5820749> REGRESSION (Safari 3.1): Mail's plain text reply omits blank line following the attribution
+
+ * editing/markup.cpp:
+ (WebCore::createFragmentFromText): When asked to create a fragment from "Attribution:\n"
+ with a context from [html, 0] to [html, 0], we'd return "<html>Attribution</html><br>".
+ Don't enclose paragraphs in clones of the context's enclosing block if that block is the
+ html or body element. Currently no way to test [DOMHTMLElement createFragmentFromText:].
+
</ins><span class="cx"> 2008-03-20 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r31144 to Safari-3-1-branch.
</span></span></pre></div>
<a id="branchesSafari31branchWebCoreeditingmarkupcpp"></a>
<div class="modfile"><h4>Modified: branches/Safari-3-1-branch/WebCore/editing/markup.cpp (31405 => 31406)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-3-1-branch/WebCore/editing/markup.cpp 2008-03-28 20:56:41 UTC (rev 31405)
+++ branches/Safari-3-1-branch/WebCore/editing/markup.cpp 2008-03-28 21:00:56 UTC (rev 31406)
</span><span class="lines">@@ -1013,7 +1013,7 @@
</span><span class="cx">
</span><span class="cx"> // Break string into paragraphs. Extra line breaks turn into empty paragraphs.
</span><span class="cx"> Node* block = enclosingBlock(context->startNode());
</span><del>- bool useClonesOfEnclosingBlock = !block->hasTagName(bodyTag);
</del><ins>+ bool useClonesOfEnclosingBlock = block && !block->hasTagName(bodyTag) && !block->hasTagName(htmlTag);
</ins><span class="cx">
</span><span class="cx"> DeprecatedStringList list = DeprecatedStringList::split('\n', string, true); // true gets us empty strings in the list
</span><span class="cx"> while (!list.isEmpty()) {
</span></span></pre>
</div>
</div>
</body>
</html>