<!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>[161050] trunk/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/161050">161050</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-23 23:44:52 -0800 (Mon, 23 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in ReplaceSelectionCommand
https://bugs.webkit.org/show_bug.cgi?id=126107
Reviewed by Benjamin Poulain.
Merge https://chromium.googlesource.com/chromium/blink/+/c1ebe5c1e808daf9db5e348a8d0ab32570b9f7a5
except the test since it doesn't reproduce the crash in WebKit.
* editing/ReplaceSelectionCommand.cpp:
(WebCore::ReplaceSelectionCommand::doApply):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceSelectionCommandcpp">trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161049 => 161050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-24 07:42:44 UTC (rev 161049)
+++ trunk/Source/WebCore/ChangeLog 2013-12-24 07:44:52 UTC (rev 161050)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-12-23 Ryosuke Niwa <rniwa@webkit.org>
+
+ Crash in ReplaceSelectionCommand
+ https://bugs.webkit.org/show_bug.cgi?id=126107
+
+ Reviewed by Benjamin Poulain.
+
+ Merge https://chromium.googlesource.com/chromium/blink/+/c1ebe5c1e808daf9db5e348a8d0ab32570b9f7a5
+ except the test since it doesn't reproduce the crash in WebKit.
+
+ * editing/ReplaceSelectionCommand.cpp:
+ (WebCore::ReplaceSelectionCommand::doApply):
+
</ins><span class="cx"> 2013-12-23 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add the pseudo classes link and any-link to the Selector Code Generator
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (161049 => 161050)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2013-12-24 07:42:44 UTC (rev 161049)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2013-12-24 07:44:52 UTC (rev 161050)
</span><span class="lines">@@ -996,22 +996,22 @@
</span><span class="cx"> // NOTE: This would be an incorrect usage of downstream() if downstream() were changed to mean the last position after
</span><span class="cx"> // p that maps to the same visible position as p (since in the case where a br is at the end of a block and collapsed
</span><span class="cx"> // away, there are positions after the br which map to the same visible position as [br, 0]).
</span><del>- Node* endBR = insertionPos.downstream().deprecatedNode()->hasTagName(brTag) ? insertionPos.downstream().deprecatedNode() : 0;
</del><ins>+ RefPtr<Node> endBR = insertionPos.downstream().deprecatedNode()->hasTagName(brTag) ? insertionPos.downstream().deprecatedNode() : nullptr;
</ins><span class="cx"> VisiblePosition originalVisPosBeforeEndBR;
</span><span class="cx"> if (endBR)
</span><del>- originalVisPosBeforeEndBR = VisiblePosition(positionBeforeNode(endBR), DOWNSTREAM).previous();
</del><ins>+ originalVisPosBeforeEndBR = VisiblePosition(positionBeforeNode(endBR.get()), DOWNSTREAM).previous();
</ins><span class="cx">
</span><del>- startBlock = enclosingBlock(insertionPos.deprecatedNode());
</del><ins>+ RefPtr<Node> insertionBlock = enclosingBlock(insertionPos.deprecatedNode());
</ins><span class="cx">
</span><span class="cx"> // Adjust insertionPos to prevent nesting.
</span><span class="cx"> // If the start was in a Mail blockquote, we will have already handled adjusting insertionPos above.
</span><del>- if (m_preventNesting && startBlock && !isTableCell(startBlock) && !startIsInsideMailBlockquote) {
- ASSERT(startBlock != currentRoot);
</del><ins>+ if (m_preventNesting && insertionBlock && !isTableCell(insertionBlock.get()) && !startIsInsideMailBlockquote) {
+ ASSERT(insertionBlock != currentRoot);
</ins><span class="cx"> VisiblePosition visibleInsertionPos(insertionPos);
</span><span class="cx"> if (isEndOfBlock(visibleInsertionPos) && !(isStartOfBlock(visibleInsertionPos) && fragment.hasInterchangeNewlineAtEnd()))
</span><del>- insertionPos = positionInParentAfterNode(startBlock);
</del><ins>+ insertionPos = positionInParentAfterNode(insertionBlock.get());
</ins><span class="cx"> else if (isStartOfBlock(visibleInsertionPos))
</span><del>- insertionPos = positionInParentBeforeNode(startBlock);
</del><ins>+ insertionPos = positionInParentBeforeNode(insertionBlock.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Paste at start or end of link goes outside of link.
</span><span class="lines">@@ -1121,14 +1121,14 @@
</span><span class="cx">
</span><span class="cx"> VisiblePosition startOfInsertedContent = firstPositionInOrBeforeNode(insertedNodes.firstNodeInserted());
</span><span class="cx">
</span><del>- // We inserted before the startBlock to prevent nesting, and the content before the startBlock wasn't in its own block and
</del><ins>+ // We inserted before the insertionBlock to prevent nesting, and the content before the insertionBlock wasn't in its own block and
</ins><span class="cx"> // didn't have a br after it, so the inserted content ended up in the same paragraph.
</span><del>- if (startBlock && insertionPos.deprecatedNode() == startBlock->parentNode() && (unsigned)insertionPos.deprecatedEditingOffset() < startBlock->nodeIndex() && !isStartOfParagraph(startOfInsertedContent))
</del><ins>+ if (insertionBlock && insertionPos.deprecatedNode() == insertionBlock->parentNode() && (unsigned)insertionPos.deprecatedEditingOffset() < insertionBlock->nodeIndex() && !isStartOfParagraph(startOfInsertedContent))
</ins><span class="cx"> insertNodeAt(createBreakElement(document()), startOfInsertedContent.deepEquivalent());
</span><span class="cx">
</span><del>- if (endBR && (plainTextFragment || shouldRemoveEndBR(endBR, originalVisPosBeforeEndBR))) {
</del><ins>+ if (endBR && (plainTextFragment || shouldRemoveEndBR(endBR.get(), originalVisPosBeforeEndBR))) {
</ins><span class="cx"> RefPtr<Node> parent = endBR->parentNode();
</span><del>- insertedNodes.willRemoveNode(endBR);
</del><ins>+ insertedNodes.willRemoveNode(endBR.get());
</ins><span class="cx"> removeNode(endBR);
</span><span class="cx"> if (Node* nodeToRemove = highestNodeToRemoveInPruning(parent.get())) {
</span><span class="cx"> insertedNodes.willRemoveNode(nodeToRemove);
</span></span></pre>
</div>
</div>
</body>
</html>