<!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>[168659] branches/safari-538.34-branch/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/168659">168659</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-12 17:11:19 -0700 (Mon, 12 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/168658">r168658</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53834branchSourceWebCoreChangeLog">branches/safari-538.34-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53834branchSourceWebCoreeditingmacEditorMacmm">branches/safari-538.34-branch/Source/WebCore/editing/mac/EditorMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53834branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/ChangeLog (168658 => 168659)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-13 00:05:55 UTC (rev 168658)
+++ branches/safari-538.34-branch/Source/WebCore/ChangeLog 2014-05-13 00:11:19 UTC (rev 168659)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-04-17 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r168658
+
+ 2014-05-12 Brady Eidson <beidson@apple.com>
+
+ Followup to "Teach Editor to support more direct replacement of a Node"
+ <rdar://problem/16817952> and https://bugs.webkit.org/show_bug.cgi?id=132834
+
+ Pair programmed and pair reviewed by Brady Eidson and Darin Adler.
+
+ * editing/mac/EditorMac.mm:
+ (WebCore::maybeCopyNodeAttributesToFragment):
+ (WebCore::Editor::replaceNodeFromPasteboard):
+
+2014-04-17 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r168650
</span><span class="cx">
</span><span class="cx"> 2014-05-12 Brady Eidson <beidson@apple.com>
</span></span></pre></div>
<a id="branchessafari53834branchSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34-branch/Source/WebCore/editing/mac/EditorMac.mm (168658 => 168659)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34-branch/Source/WebCore/editing/mac/EditorMac.mm 2014-05-13 00:05:55 UTC (rev 168658)
+++ branches/safari-538.34-branch/Source/WebCore/editing/mac/EditorMac.mm 2014-05-13 00:11:19 UTC (rev 168659)
</span><span class="lines">@@ -265,21 +265,21 @@
</span><span class="cx"> pasteAsPlainTextWithPasteboard(pasteboard);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void maybeCopyNodeAttributesToFragment(Node* node, DocumentFragment* fragment)
</del><ins>+static void maybeCopyNodeAttributesToFragment(const Node& node, DocumentFragment& fragment)
</ins><span class="cx"> {
</span><span class="cx"> // This is only supported for single-Node fragments.
</span><del>- Node* firstChild = fragment->firstChild();
- if (firstChild != fragment->lastChild())
</del><ins>+ Node* firstChild = fragment.firstChild();
+ if (!firstChild || firstChild != fragment.lastChild())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // And only supported for HTML elements.
</span><del>- if (!node->isHTMLElement() || !firstChild->isHTMLElement())
</del><ins>+ if (!node.isHTMLElement() || !firstChild->isHTMLElement())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // And only if the source Element and destination Element have the same HTML tag name.
</span><del>- const Element& oldElement = toHTMLElement(*node);
- Element& newElement = toHTMLElement(*firstChild);
- if (!oldElement.hasTagName(newElement.tagQName()))
</del><ins>+ const HTMLElement& oldElement = toHTMLElement(node);
+ HTMLElement& newElement = toHTMLElement(*firstChild);
+ if (oldElement.localName() != newElement.localName())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> for (const Attribute& attribute : oldElement.attributesIterator()) {
</span><span class="lines">@@ -310,13 +310,12 @@
</span><span class="cx"> client()->setInsertionPasteboard(NSGeneralPboard);
</span><span class="cx">
</span><span class="cx"> bool chosePlainText;
</span><del>- RefPtr<DocumentFragment> fragment = webContentFromPasteboard(pasteboard, *range, true, chosePlainText);
</del><ins>+ if (RefPtr<DocumentFragment> fragment = webContentFromPasteboard(pasteboard, *range, true, chosePlainText)) {
+ maybeCopyNodeAttributesToFragment(*node, *fragment);
+ if (shouldInsertFragment(fragment, range, EditorInsertActionPasted))
+ pasteAsFragment(fragment.release(), canSmartReplaceWithPasteboard(pasteboard), false, MailBlockquoteHandling::IgnoreBlockquote);
+ }
</ins><span class="cx">
</span><del>- maybeCopyNodeAttributesToFragment(node, fragment.get());
-
- if (fragment && shouldInsertFragment(fragment, range, EditorInsertActionPasted))
- pasteAsFragment(fragment, canSmartReplaceWithPasteboard(pasteboard), false, MailBlockquoteHandling::IgnoreBlockquote);
-
</del><span class="cx"> client()->setInsertionPasteboard(String());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>