<!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>[168641] 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/168641">168641</a></dd>
<dt>Author</dt> <dd>jhoneycutt@apple.com</dd>
<dt>Date</dt> <dd>2014-05-12 13:31:29 -0700 (Mon, 12 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/167818">r167818</a>): editing/inserting/typing-space-to-trigger-smart-link.html fails on WebKit1 bots
<https://bugs.webkit.org/show_bug.cgi?id=132207>
<rdar://problem/16730393>
Source/WebCore:
Reverts the previous workaround in favor of a more specific fix for the
null dereference.
Reviewed by Darin Adler.
* editing/ApplyStyleCommand.cpp:
(WebCore::ApplyStyleCommand::applyInlineStyleToNodeRange):
Check whether the run's start and end are still in the document, as
removeConflictingInlineStyleFromRun() may have removed them.
* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::apply):
Reverted previous workaround.
(WebCore::ApplyEditCommand::ReentrancyGuard::isRecursiveCall): Deleted.
(WebCore::ApplyEditCommand::ReentrancyGuard::Scope::Scope): Deleted.
(WebCore::ApplyEditCommand::ReentrancyGuard::Scope::~Scope): Deleted.
LayoutTests:
Reviewed by Darin Adler.
* editing/apply-style-iframe-crash-expected.txt:
Rebased test result has one fewer new line.
* platform/mac-wk1/TestExpectations:
Remove test from list of expected failures.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingapplystyleiframecrashexpectedtxt">trunk/LayoutTests/editing/apply-style-iframe-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingApplyStyleCommandcpp">trunk/Source/WebCore/editing/ApplyStyleCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandcpp">trunk/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168640 => 168641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-12 20:16:43 UTC (rev 168640)
+++ trunk/LayoutTests/ChangeLog 2014-05-12 20:31:29 UTC (rev 168641)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-05-09 Jon Honeycutt <jhoneycutt@apple.com>
+
+ REGRESSION (r167818): editing/inserting/typing-space-to-trigger-smart-link.html fails on WebKit1 bots
+
+ <https://bugs.webkit.org/show_bug.cgi?id=132207>
+ <rdar://problem/16730393>
+
+ Reviewed by Darin Adler.
+
+ * editing/apply-style-iframe-crash-expected.txt:
+ Rebased test result has one fewer new line.
+ * platform/mac-wk1/TestExpectations:
+ Remove test from list of expected failures.
+
</ins><span class="cx"> 2014-05-12 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Implement EXT_shader_texture_lod in WebGL.
</span></span></pre></div>
<a id="trunkLayoutTestseditingapplystyleiframecrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/apply-style-iframe-crash-expected.txt (168640 => 168641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/apply-style-iframe-crash-expected.txt 2014-05-12 20:16:43 UTC (rev 168640)
+++ trunk/LayoutTests/editing/apply-style-iframe-crash-expected.txt 2014-05-12 20:31:29 UTC (rev 168641)
</span><span class="lines">@@ -1,5 +1,4 @@
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> PASS
</span><span class="cx"> WebKit bug #132103: Crash applying editing commands from iframe onload event.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (168640 => 168641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2014-05-12 20:16:43 UTC (rev 168640)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2014-05-12 20:31:29 UTC (rev 168641)
</span><span class="lines">@@ -15,8 +15,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/124318 fullscreen/anonymous-block-merge-crash.html [ Pass Failure ]
</span><span class="cx">
</span><del>-webkit.org/b/132207 editing/inserting/typing-space-to-trigger-smart-link.html [ Failure ]
-
</del><span class="cx"> ### END OF (1) Failures with bug reports
</span><span class="cx"> ########################################
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168640 => 168641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-12 20:16:43 UTC (rev 168640)
+++ trunk/Source/WebCore/ChangeLog 2014-05-12 20:31:29 UTC (rev 168641)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-05-09 Jon Honeycutt <jhoneycutt@apple.com>
+
+ REGRESSION (r167818): editing/inserting/typing-space-to-trigger-smart-link.html fails on WebKit1 bots
+
+ <https://bugs.webkit.org/show_bug.cgi?id=132207>
+ <rdar://problem/16730393>
+
+ Reverts the previous workaround in favor of a more specific fix for the
+ null dereference.
+
+ Reviewed by Darin Adler.
+
+ * editing/ApplyStyleCommand.cpp:
+ (WebCore::ApplyStyleCommand::applyInlineStyleToNodeRange):
+ Check whether the run's start and end are still in the document, as
+ removeConflictingInlineStyleFromRun() may have removed them.
+
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::CompositeEditCommand::apply):
+ Reverted previous workaround.
+ (WebCore::ApplyEditCommand::ReentrancyGuard::isRecursiveCall): Deleted.
+ (WebCore::ApplyEditCommand::ReentrancyGuard::Scope::Scope): Deleted.
+ (WebCore::ApplyEditCommand::ReentrancyGuard::Scope::~Scope): Deleted.
+
</ins><span class="cx"> 2014-05-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Clean up CrossThreadTask
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyStyleCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.cpp (168640 => 168641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2014-05-12 20:16:43 UTC (rev 168640)
+++ trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2014-05-12 20:31:29 UTC (rev 168641)
</span><span class="lines">@@ -812,9 +812,10 @@
</span><span class="cx"> runs.append(InlineRunToApplyStyle(runStart, runEnd, pastEndNode));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (size_t i = 0; i < runs.size(); i++) {
- removeConflictingInlineStyleFromRun(style, runs[i].start, runs[i].end, runs[i].pastEndNode);
- runs[i].positionForStyleComputation = positionToComputeInlineStyleChange(runs[i].start, runs[i].dummyElement);
</del><ins>+ for (auto& run : runs) {
+ removeConflictingInlineStyleFromRun(style, run.start, run.end, run.pastEndNode);
+ if (run.startAndEndAreStillInDocument())
+ run.positionForStyleComputation = positionToComputeInlineStyleChange(run.start, run.dummyElement);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (168640 => 168641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2014-05-12 20:16:43 UTC (rev 168640)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2014-05-12 20:31:29 UTC (rev 168641)
</span><span class="lines">@@ -80,26 +80,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-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
-
</del><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">@@ -214,12 +194,6 @@
</span><span class="cx">
</span><span class="cx"> void CompositeEditCommand::apply()
</span><span class="cx"> {
</span><del>- // 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;
-
</del><span class="cx"> if (!endingSelection().isContentRichlyEditable()) {
</span><span class="cx"> switch (editingAction()) {
</span><span class="cx"> case EditActionTyping:
</span><span class="lines">@@ -247,7 +221,6 @@
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> EventQueueScope eventQueueScope;
</span><del>- ApplyEditCommand::ReentrancyGuard::Scope reentrancyGuardScope;
</del><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>