<!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>[214156] branches/safari-603-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/214156">214156</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-03-19 18:32:16 -0700 (Sun, 19 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213897">r213897</a>. rdar://problem/30921833</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsTestExpectations">branches/safari-603-branch/LayoutTests/TestExpectations</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmacwk1TestExpectations">branches/safari-603-branch/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreeditingEditorCommandcpp">branches/safari-603-branch/Source/WebCore/editing/EditorCommand.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderViewcpp">branches/safari-603-branch/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCorerenderingRenderViewh">branches/safari-603-branch/Source/WebCore/rendering/RenderView.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestseditingexecCommandresourcesselfclosingmodaldialoghtml">branches/safari-603-branch/LayoutTests/editing/execCommand/resources/self-closing-modal-dialog.html</a></li>
<li><a href="#branchessafari603branchLayoutTestseditingexecCommandshowmodaldialogduringexecCommandexpectedtxt">branches/safari-603-branch/LayoutTests/editing/execCommand/show-modal-dialog-during-execCommand-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestseditingexecCommandshowmodaldialogduringexecCommandhtml">branches/safari-603-branch/LayoutTests/editing/execCommand/show-modal-dialog-during-execCommand.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (214155 => 214156)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-20 01:32:12 UTC (rev 214155)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-03-20 01:32:16 UTC (rev 214156)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2017-03-16 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><ins>+ Merge r213897. rdar://problem/30921833
+
+ 2017-03-13 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Make RepaintRegionAccumulator hold a WeakPtr to its root RenderView
+ https://bugs.webkit.org/show_bug.cgi?id=168480
+ <rdar://problem/30566976>
+
+ Reviewed by Antti Koivisto.
+
+ Introduces a new layout test. See WebCore ChangeLog for more details.
+
+ * TestExpectations:
+ * editing/execCommand/show-modal-dialog-during-execCommand-expected.txt: Added.
+ * editing/execCommand/show-modal-dialog-during-execCommand.html: Added.
+ * editing/execCommand/resources/self-closing-modal-dialog.html: Added.
+ * platform/mac-wk1/TestExpectations:
+
+2017-03-16 Jason Marcell <jmarcell@apple.com>
+
</ins><span class="cx"> Merge r213501. rdar://problem/30921830
</span><span class="cx">
</span><span class="cx"> 2017-03-06 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/TestExpectations (214155 => 214156)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/TestExpectations 2017-03-20 01:32:12 UTC (rev 214155)
+++ branches/safari-603-branch/LayoutTests/TestExpectations 2017-03-20 01:32:16 UTC (rev 214156)
</span><span class="lines">@@ -33,6 +33,9 @@
</span><span class="cx"> media/controls/ipad [ Skip ]
</span><span class="cx"> fast/text-autosizing [ Skip ]
</span><span class="cx">
</span><ins>+# window.showModalDialog is only tested in DumpRenderTree on Mac.
+editing/execCommand/show-modal-dialog-during-execCommand.html [ Skip ]
+
</ins><span class="cx"> fast/shadow-dom/touch-event-on-text-assigned-to-slot.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> fast/forms/attributed-strings.html [ Skip ]
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestseditingexecCommandresourcesselfclosingmodaldialoghtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/editing/execCommand/resources/self-closing-modal-dialog.html (0 => 214156)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/editing/execCommand/resources/self-closing-modal-dialog.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/editing/execCommand/resources/self-closing-modal-dialog.html 2017-03-20 01:32:16 UTC (rev 214156)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<script>
+setTimeout(() => {
+ window.close();
+ if (window.testRunner) {
+ testRunner.notifyDone();
+ testRunner.abortModal();
+ }
+}, 1000);
+</script>
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestseditingexecCommandshowmodaldialogduringexecCommandexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/editing/execCommand/show-modal-dialog-during-execCommand-expected.txt (0 => 214156)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/editing/execCommand/show-modal-dialog-during-execCommand-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/editing/execCommand/show-modal-dialog-during-execCommand-expected.txt 2017-03-20 01:32:16 UTC (rev 214156)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestseditingexecCommandshowmodaldialogduringexecCommandhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/editing/execCommand/show-modal-dialog-during-execCommand.html (0 => 214156)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/editing/execCommand/show-modal-dialog-during-execCommand.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/editing/execCommand/show-modal-dialog-during-execCommand.html 2017-03-20 01:32:16 UTC (rev 214156)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+<html>
+
+<head>
+<script>
+function sleep(ms) {
+ let start = new Date();
+ while (new Date() - start < ms);
+}
+
+(() => {
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setCanOpenWindows();
+ }
+})();
+
+window.onclick = () => {
+ window.onclick = null;
+ document.designMode = "on";
+ document.execCommand("selectAll");
+
+ let frame = document.body.appendChild(document.createElement("iframe"));
+ let mediaList = frame.contentWindow.matchMedia("(max-width: 100px)");
+ mediaList.addListener(() => {
+ let link = document.createElement("a");
+ link.href = "https://www.webkit.org";
+ link.click();
+ showModalDialog("resources/self-closing-modal-dialog.html");
+ });
+
+ document.execCommand("delete");
+}
+</script>
+</head>
+
+<body>
+<script>
+if (window.eventSender) {
+ eventSender.mouseMoveTo(innerHeight / 2, innerWidth / 2);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+}
+</script>
+</body>
+
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac-wk1/TestExpectations (214155 => 214156)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac-wk1/TestExpectations 2017-03-20 01:32:12 UTC (rev 214155)
+++ branches/safari-603-branch/LayoutTests/platform/mac-wk1/TestExpectations 2017-03-20 01:32:16 UTC (rev 214156)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> # Platform-specific tests. Skipped globally, then re-enabled here.
</span><span class="cx"> #//////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx">
</span><ins>+editing/execCommand/execCommand-across-different-documents.html [ Pass ]
</ins><span class="cx"> fast/forms/attributed-strings.html [ Pass ]
</span><span class="cx">
</span><span class="cx"> #//////////////////////////////////////////////////////////////////////////////////////////
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (214155 => 214156)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-20 01:32:12 UTC (rev 214155)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-03-20 01:32:16 UTC (rev 214156)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2017-03-16 Jason Marcell <jmarcell@apple.com>
</span><span class="cx">
</span><ins>+ Merge r213897. rdar://problem/30921833
+
+ 2017-03-13 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Make RepaintRegionAccumulator hold a WeakPtr to its root RenderView
+ https://bugs.webkit.org/show_bug.cgi?id=168480
+ <rdar://problem/30566976>
+
+ Reviewed by Antti Koivisto.
+
+ Implements two mitigations to prevent the symptoms of the bug from occurring (see the bugzilla for more details).
+
+ Test: editing/execCommand/show-modal-dialog-during-execCommand.html
+
+ * editing/EditorCommand.cpp:
+ (WebCore::Editor::Command::execute):
+
+ Do not allow edit commands to execute if the frame's document before and after layout differ (that is, edit commands
+ triggered by a certain document should not run on a different document).
+
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::RenderView):
+ (WebCore::RenderView::RepaintRegionAccumulator::RepaintRegionAccumulator):
+
+ Turns RepaintRegionAccumulator's reference to its root RenderView into a WeakPtr to gracefully handle the case
+ where its RenderView is destroyed before RepaintRegionAccumulator's destructor gets a chance to flush the
+ RenderView's repaint regions.
+
+ * rendering/RenderView.h:
+
+2017-03-16 Jason Marcell <jmarcell@apple.com>
+
</ins><span class="cx"> Merge r213833. rdar://problem/31092879
</span><span class="cx">
</span><span class="cx"> 2017-03-13 Miguel Gomez <magomez@igalia.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreeditingEditorCommandcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/editing/EditorCommand.cpp (214155 => 214156)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/editing/EditorCommand.cpp 2017-03-20 01:32:12 UTC (rev 214155)
+++ branches/safari-603-branch/Source/WebCore/editing/EditorCommand.cpp 2017-03-20 01:32:16 UTC (rev 214156)
</span><span class="lines">@@ -1772,7 +1772,11 @@
</span><span class="cx"> if (!allowExecutionWhenDisabled())
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- m_frame->document()->updateLayoutIgnorePendingStylesheets();
</del><ins>+ auto document = m_frame->document();
+ document->updateLayoutIgnorePendingStylesheets();
+ if (m_frame->document() != document)
+ return false;
+
</ins><span class="cx"> return m_command->execute(*m_frame, triggeringEvent, m_source, parameter);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderView.cpp (214155 => 214156)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderView.cpp 2017-03-20 01:32:12 UTC (rev 214155)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderView.cpp 2017-03-20 01:32:16 UTC (rev 214156)
</span><span class="lines">@@ -121,6 +121,7 @@
</span><span class="cx"> RenderView::RenderView(Document& document, RenderStyle&& style)
</span><span class="cx"> : RenderBlockFlow(document, WTFMove(style))
</span><span class="cx"> , m_frameView(*document.view())
</span><ins>+ , m_weakFactory(this)
</ins><span class="cx"> , m_lazyRepaintTimer(*this, &RenderView::lazyRepaintTimerFired)
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> , m_selectionRectGatherer(*this)
</span><span class="lines">@@ -1416,10 +1417,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderView::RepaintRegionAccumulator::RepaintRegionAccumulator(RenderView* view)
</span><del>- : m_rootView(view ? view->document().topDocument().renderView() : nullptr)
</del><span class="cx"> {
</span><del>- if (!m_rootView)
</del><ins>+ if (!view)
</ins><span class="cx"> return;
</span><ins>+
+ auto* rootRenderView = view->document().topDocument().renderView();
+ if (!rootRenderView)
+ return;
+
+ m_rootView = rootRenderView->createWeakPtr();
</ins><span class="cx"> m_wasAccumulatingRepaintRegion = !!m_rootView->m_accumulatedRepaintRegion;
</span><span class="cx"> if (!m_wasAccumulatingRepaintRegion)
</span><span class="cx"> m_rootView->m_accumulatedRepaintRegion = std::make_unique<Region>();
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/rendering/RenderView.h (214155 => 214156)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/rendering/RenderView.h 2017-03-20 01:32:12 UTC (rev 214155)
+++ branches/safari-603-branch/Source/WebCore/rendering/RenderView.h 2017-03-20 01:32:16 UTC (rev 214156)
</span><span class="lines">@@ -238,10 +238,12 @@
</span><span class="cx"> ~RepaintRegionAccumulator();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RenderView* m_rootView;
</del><ins>+ WeakPtr<RenderView> m_rootView;
</ins><span class="cx"> bool m_wasAccumulatingRepaintRegion;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ WeakPtr<RenderView> createWeakPtr() { return m_weakFactory.createWeakPtr(); }
+
</ins><span class="cx"> void scheduleLazyRepaint(RenderBox&);
</span><span class="cx"> void unscheduleLazyRepaint(RenderBox&);
</span><span class="cx">
</span><span class="lines">@@ -337,6 +339,7 @@
</span><span class="cx"> private:
</span><span class="cx"> FrameView& m_frameView;
</span><span class="cx">
</span><ins>+ WeakPtrFactory<RenderView> m_weakFactory;
</ins><span class="cx"> RenderObject* m_selectionUnsplitStart { nullptr };
</span><span class="cx"> RenderObject* m_selectionUnsplitEnd { nullptr };
</span><span class="cx"> std::optional<unsigned> m_selectionUnsplitStartPos;
</span></span></pre>
</div>
</div>
</body>
</html>