<!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>[242677] 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/242677">242677</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2019-03-09 19:26:10 -0800 (Sat, 09 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add assertions to help debug crash under DOMWindowExtension::suspendForPageCache()
https://bugs.webkit.org/show_bug.cgi?id=195488

Reviewed by Ryosuke Niwa.

Try and figure out how the document can be detached from its frame while we're suspending
DOMWindowExtensions.

* page/DOMWindow.cpp:
(WebCore::DOMWindow::willDetachDocumentFromFrame):
(WebCore::DOMWindow::suspendForPageCache):
* page/DOMWindow.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowh">trunk/Source/WebCore/page/DOMWindow.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (242676 => 242677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-03-10 02:25:42 UTC (rev 242676)
+++ trunk/Source/WebCore/ChangeLog      2019-03-10 03:26:10 UTC (rev 242677)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2019-03-09  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><ins>+        Add assertions to help debug crash under DOMWindowExtension::suspendForPageCache()
+        https://bugs.webkit.org/show_bug.cgi?id=195488
+
+        Reviewed by Ryosuke Niwa.
+
+        Try and figure out how the document can be detached from its frame while we're suspending
+        DOMWindowExtensions.
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::willDetachDocumentFromFrame):
+        (WebCore::DOMWindow::suspendForPageCache):
+        * page/DOMWindow.h:
+
+2019-03-09  Chris Dumez  <cdumez@apple.com>
+
</ins><span class="cx">         Simplify DOMWindowProperty code / handling
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=195495
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (242676 => 242677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp  2019-03-10 02:25:42 UTC (rev 242676)
+++ trunk/Source/WebCore/page/DOMWindow.cpp     2019-03-10 03:26:10 UTC (rev 242677)
</span><span class="lines">@@ -119,6 +119,7 @@
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/Ref.h>
</span><ins>+#include <wtf/SetForScope.h>
</ins><span class="cx"> #include <wtf/Variant.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> 
</span><span class="lines">@@ -473,6 +474,8 @@
</span><span class="cx">     if (!frame())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    RELEASE_ASSERT(!m_isSuspendingObservers);
+
</ins><span class="cx">     // It is necessary to copy m_observers to a separate vector because the Observer may
</span><span class="cx">     // unregister themselves from the DOMWindow as a result of the call to willDetachGlobalObjectFromFrame.
</span><span class="cx">     for (auto& observer : copyToVector(m_observers)) {
</span><span class="lines">@@ -521,10 +524,14 @@
</span><span class="cx"> 
</span><span class="cx"> void DOMWindow::suspendForPageCache()
</span><span class="cx"> {
</span><ins>+    SetForScope<bool> isSuspendingObservers(m_isSuspendingObservers, true);
+    RELEASE_ASSERT(frame());
+
</ins><span class="cx">     for (auto* observer : copyToVector(m_observers)) {
</span><span class="cx">         if (m_observers.contains(observer))
</span><span class="cx">             observer->suspendForPageCache();
</span><span class="cx">     }
</span><ins>+    RELEASE_ASSERT(frame());
</ins><span class="cx"> 
</span><span class="cx">     m_suspendedForDocumentSuspension = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.h (242676 => 242677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.h    2019-03-10 02:25:42 UTC (rev 242676)
+++ trunk/Source/WebCore/page/DOMWindow.h       2019-03-10 03:26:10 UTC (rev 242677)
</span><span class="lines">@@ -393,6 +393,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool m_shouldPrintWhenFinishedLoading { false };
</span><span class="cx">     bool m_suspendedForDocumentSuspension { false };
</span><ins>+    bool m_isSuspendingObservers { false };
</ins><span class="cx">     Optional<bool> m_canShowModalDialogOverride;
</span><span class="cx"> 
</span><span class="cx">     HashSet<Observer*> m_observers;
</span></span></pre>
</div>
</div>

</body>
</html>