<!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>[169220] branches/safari-537.77-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/169220">169220</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 14:37:38 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/167818">r167818</a>. <rdar://problem/16975502></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53777branchLayoutTestsChangeLog">branches/safari-537.77-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreChangeLog">branches/safari-537.77-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53777branchSourceWebCoreeditingCompositeEditCommandcpp">branches/safari-537.77-branch/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53777branchLayoutTestseditingapplystyleiframecrashexpectedtxt">branches/safari-537.77-branch/LayoutTests/editing/apply-style-iframe-crash-expected.txt</a></li>
<li><a href="#branchessafari53777branchLayoutTestseditingapplystyleiframecrashhtml">branches/safari-537.77-branch/LayoutTests/editing/apply-style-iframe-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53777branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/LayoutTests/ChangeLog (169219 => 169220)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/ChangeLog 2014-05-22 21:35:30 UTC (rev 169219)
+++ branches/safari-537.77-branch/LayoutTests/ChangeLog 2014-05-22 21:37:38 UTC (rev 169220)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-05-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r167818
+
+ 2014-04-23 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Crash applying editing commands from iframe onload event
+
+ <https://bugs.webkit.org/show_bug.cgi?id=132103>
+ <rdar://problem/15696351>
+
+ Reviewed by Darin Adler.
+
+ * editing/apply-style-iframe-crash-expected.txt: Added.
+ * editing/apply-style-iframe-crash.html: Added.
+
+2014-05-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r166628
</span><span class="cx">
</span><span class="cx"> 2014-04-01 Jon Honeycutt <jhoneycutt@apple.com>
</span></span></pre></div>
<a id="branchessafari53777branchLayoutTestseditingapplystyleiframecrashexpectedtxtfromrev167818trunkLayoutTestseditingapplystyleiframecrashexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.77-branch/LayoutTests/editing/apply-style-iframe-crash-expected.txt (from rev 167818, trunk/LayoutTests/editing/apply-style-iframe-crash-expected.txt) (0 => 169220)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/editing/apply-style-iframe-crash-expected.txt (rev 0)
+++ branches/safari-537.77-branch/LayoutTests/editing/apply-style-iframe-crash-expected.txt 2014-05-22 21:37:38 UTC (rev 169220)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+
+
+
+PASS
+WebKit bug #132103: Crash applying editing commands from iframe onload event.
</ins></span></pre></div>
<a id="branchessafari53777branchLayoutTestseditingapplystyleiframecrashhtmlfromrev167818trunkLayoutTestseditingapplystyleiframecrashhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.77-branch/LayoutTests/editing/apply-style-iframe-crash.html (from rev 167818, trunk/LayoutTests/editing/apply-style-iframe-crash.html) (0 => 169220)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/LayoutTests/editing/apply-style-iframe-crash.html (rev 0)
+++ branches/safari-537.77-branch/LayoutTests/editing/apply-style-iframe-crash.html 2014-05-22 21:37:38 UTC (rev 169220)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<script>
+ function frameLoaded() {
+ if (document.counter)
+ document.counter++;
+ else
+ document.counter = 1;
+
+ if (document.counter <= 16) {
+ document.designMode='on';
+ document.execCommand('selectall');
+ document.execCommand('italic');
+ }
+ }
+
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ window.addEventListener("load", function() {
+ document.getElementById("console").innerText = 'PASS';
+ if (window.testRunner)
+ testRunner.notifyDone();
+ });
+</script>
+
+
+<h1><button><iframe></iframe></button>
+</h1><input><iframe onload="frameLoaded()"></iframe>
+
+<div id="console">FAIL</div>
+
+<div>
+ WebKit bug #<a href="https://bugs.webkit.org/show_bug.cgi?id=132103">132103</a>: Crash applying editing commands from iframe onload event.
+</div>
</ins></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/ChangeLog (169219 => 169220)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/ChangeLog 2014-05-22 21:35:30 UTC (rev 169219)
+++ branches/safari-537.77-branch/Source/WebCore/ChangeLog 2014-05-22 21:37:38 UTC (rev 169220)
</span><span class="lines">@@ -20,6 +20,32 @@
</span><span class="cx">
</span><span class="cx"> 2014-05-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r167818
+
+ 2014-04-23 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Crash applying editing commands from iframe onload event
+
+ <https://bugs.webkit.org/show_bug.cgi?id=132103>
+ <rdar://problem/15696351>
+
+ This patch merges the Chromium bug workaround from
+ <http://src.chromium.org/viewvc/blink?revision=162080&view=revision>,
+ which prevents reentrancy in CompositeEditCommand::apply().
+
+ Reviewed by Darin Adler.
+
+ Test: editing/apply-style-iframe-crash.html
+
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::HTMLNames::ReentrancyGuard::isRecursiveCall):
+ (WebCore::HTMLNames::ReentrancyGuard::Scope::Scope):
+ (WebCore::HTMLNames::ReentrancyGuard::Scope::~Scope):
+ (WebCore::CompositeEditCommand::apply):
+ If this is a recursive call, return early.
+
+2014-05-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r167264
</span><span class="cx">
</span><span class="cx"> 2014-04-14 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari53777branchSourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.77-branch/Source/WebCore/editing/CompositeEditCommand.cpp (169219 => 169220)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.77-branch/Source/WebCore/editing/CompositeEditCommand.cpp 2014-05-22 21:35:30 UTC (rev 169219)
+++ branches/safari-537.77-branch/Source/WebCore/editing/CompositeEditCommand.cpp 2014-05-22 21:37:38 UTC (rev 169220)
</span><span class="lines">@@ -78,6 +78,26 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><ins>+namespace ApplyEditCommand {
+
+class ReentrancyGuard {
+public:
+ static bool isRecursiveCall() { return s_nestingCounter; }
+
+ class Scope {
+ public:
+ Scope() { ++s_nestingCounter; }
+ ~Scope() { --s_nestingCounter; }
+ };
+ friend class Scope;
+
+private:
+ static unsigned s_nestingCounter;
+};
+unsigned ApplyEditCommand::ReentrancyGuard::s_nestingCounter;
+
+} // namespace ApplyEditCommand
+
</ins><span class="cx"> PassRefPtr<EditCommandComposition> EditCommandComposition::create(Document* document,
</span><span class="cx"> const VisibleSelection& startingSelection, const VisibleSelection& endingSelection, EditAction editAction)
</span><span class="cx"> {
</span><span class="lines">@@ -184,6 +204,12 @@
</span><span class="cx">
</span><span class="cx"> void CompositeEditCommand::apply()
</span><span class="cx"> {
</span><ins>+ // It's possible to enter this recursively, but legitimate cases of that are rare, and it can cause crashes. As a
+ // temporary fix, guard against recursive calls.
+ // FIXME: <rdar://16701803> Remove this workaround when <rdar://15797536> is fixed.
+ if (ApplyEditCommand::ReentrancyGuard::isRecursiveCall())
+ return;
+
</ins><span class="cx"> if (!endingSelection().isContentRichlyEditable()) {
</span><span class="cx"> switch (editingAction()) {
</span><span class="cx"> case EditActionTyping:
</span><span class="lines">@@ -209,7 +235,8 @@
</span><span class="cx"> Frame* frame = document()->frame();
</span><span class="cx"> ASSERT(frame);
</span><span class="cx"> {
</span><del>- EventQueueScope scope;
</del><ins>+ EventQueueScope eventQueueScope;
+ ApplyEditCommand::ReentrancyGuard::Scope reentrancyGuardScope;
</ins><span class="cx"> #if ENABLE(DELETION_UI)
</span><span class="cx"> DeleteButtonControllerDisableScope deleteButtonControllerDisableScope(frame);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>