<!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>[203870] branches/safari-602-branch/Source/WebKit2</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/203870">203870</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-29 00:11:36 -0700 (Fri, 29 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203687">r203687</a>. rdar://problem/27399998</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessProcessAssertioncpp">branches/safari-602-branch/Source/WebKit2/UIProcess/ProcessAssertion.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessProcessAssertionh">branches/safari-602-branch/Source/WebKit2/UIProcess/ProcessAssertion.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessiosProcessAssertionIOSmm">branches/safari-602-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (203869 => 203870)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-07-29 07:11:33 UTC (rev 203869)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-07-29 07:11:36 UTC (rev 203870)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2016-07-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203687. rdar://problem/27399998
+
+ 2016-07-25 Chris Dumez <cdumez@apple.com>
+
+ [iOS] Make sure we call the ProcessAssertion invalidation handler on the main thread
+ https://bugs.webkit.org/show_bug.cgi?id=160140
+ <rdar://problem/27399998>
+
+ Reviewed by Darin Adler.
+
+ Based on crash traces, it appears BKSProcessAssertion is calling our
+ invalidation handler on a background thread. This was not anticipated
+ and therefore, this would lead to thread safety issues and crashes.
+
+ We now make sure to call our invalidation handler on the main thread.
+ We also use a WeakPtr to ensure that the ProcessAssertion is still
+ alive once on the main thread and before calling the invalidation
+ handler.
+
+ * UIProcess/ProcessAssertion.cpp:
+ (WebKit::ProcessAssertion::ProcessAssertion):
+ * UIProcess/ProcessAssertion.h:
+ (WebKit::ProcessAssertion::ProcessAssertion):
+ (WebKit::ProcessAssertion::createWeakPtr):
+ * UIProcess/ios/ProcessAssertionIOS.mm:
+ (WebKit::ProcessAssertion::ProcessAssertion):
+ (WebKit::ProcessAssertion::markAsInvalidated):
+
+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203671. rdar://problem/27409315
</span><span class="cx">
</span><span class="cx"> 2016-07-24 Sam Weinig <sam@webkit.org>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessProcessAssertioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ProcessAssertion.cpp (203869 => 203870)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/ProcessAssertion.cpp 2016-07-29 07:11:33 UTC (rev 203869)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ProcessAssertion.cpp 2016-07-29 07:11:36 UTC (rev 203870)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-ProcessAssertion::ProcessAssertion(pid_t, AssertionState assertionState, std::function<void()>)
</del><ins>+ProcessAssertion::ProcessAssertion(pid_t, AssertionState assertionState, Function<void()>&&)
</ins><span class="cx"> : m_assertionState(assertionState)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessProcessAssertionh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ProcessAssertion.h (203869 => 203870)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/ProcessAssertion.h 2016-07-29 07:11:33 UTC (rev 203869)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ProcessAssertion.h 2016-07-29 07:11:36 UTC (rev 203870)
</span><span class="lines">@@ -27,9 +27,11 @@
</span><span class="cx"> #define ProcessAssertion_h
</span><span class="cx">
</span><span class="cx"> #include <functional>
</span><ins>+#include <wtf/Function.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><ins>+#include <wtf/WeakPtr.h>
</ins><span class="cx"> OBJC_CLASS BKSProcessAssertion;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -49,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> class ProcessAssertion {
</span><span class="cx"> public:
</span><del>- ProcessAssertion(pid_t, AssertionState, std::function<void()> invalidationCallback = { });
</del><ins>+ ProcessAssertion(pid_t, AssertionState, Function<void()>&& invalidationCallback = { });
</ins><span class="cx"> ~ProcessAssertion();
</span><span class="cx">
</span><span class="cx"> void setClient(ProcessAssertionClient& client) { m_client = &client; }
</span><span class="lines">@@ -66,8 +68,13 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> #if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
</span><ins>+ WeakPtr<ProcessAssertion> createWeakPtr() { return m_weakFactory.createWeakPtr(); }
+ void markAsInvalidated();
+
</ins><span class="cx"> RetainPtr<BKSProcessAssertion> m_assertion;
</span><span class="cx"> Validity m_validity { Validity::Unset };
</span><ins>+ WeakPtrFactory<ProcessAssertion> m_weakFactory;
+ Function<void()> m_invalidationCallback;
</ins><span class="cx"> #endif
</span><span class="cx"> AssertionState m_assertionState;
</span><span class="cx"> ProcessAssertionClient* m_client { nullptr };
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessiosProcessAssertionIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm (203869 => 203870)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2016-07-29 07:11:33 UTC (rev 203869)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2016-07-29 07:11:36 UTC (rev 203870)
</span><span class="lines">@@ -157,21 +157,28 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ProcessAssertion::ProcessAssertion(pid_t pid, AssertionState assertionState, std::function<void()> invalidationCallback)
- : m_assertionState(assertionState)
</del><ins>+ProcessAssertion::ProcessAssertion(pid_t pid, AssertionState assertionState, Function<void()>&& invalidationCallback)
+ : m_weakFactory(this)
+ , m_invalidationCallback(WTFMove(invalidationCallback))
+ , m_assertionState(assertionState)
</ins><span class="cx"> {
</span><ins>+ auto weakThis = createWeakPtr();
</ins><span class="cx"> BKSProcessAssertionAcquisitionHandler handler = ^(BOOL acquired) {
</span><span class="cx"> if (!acquired) {
</span><span class="cx"> LOG_ALWAYS_ERROR(true, "Unable to acquire assertion for process %d", pid);
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- m_validity = Validity::No;
- invalidationCallback();
</del><ins>+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (weakThis)
+ markAsInvalidated();
+ });
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx"> m_assertion = adoptNS([[BKSProcessAssertion alloc] initWithPID:pid flags:flagsForState(assertionState) reason:BKSProcessAssertionReasonExtension name:@"Web content visible" withHandler:handler]);
</span><span class="cx"> m_assertion.get().invalidationHandler = ^() {
</span><del>- m_validity = Validity::No;
- invalidationCallback();
</del><ins>+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (weakThis)
+ markAsInvalidated();
+ });
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -184,6 +191,14 @@
</span><span class="cx"> [m_assertion invalidate];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ProcessAssertion::markAsInvalidated()
+{
+ ASSERT(RunLoop::isMain());
+
+ m_validity = Validity::No;
+ m_invalidationCallback();
+}
+
</ins><span class="cx"> void ProcessAssertion::setState(AssertionState assertionState)
</span><span class="cx"> {
</span><span class="cx"> if (m_assertionState == assertionState)
</span><span class="lines">@@ -240,7 +255,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-ProcessAssertion::ProcessAssertion(pid_t, AssertionState assertionState, std::function<void()>)
</del><ins>+ProcessAssertion::ProcessAssertion(pid_t, AssertionState assertionState, Function<void()>&&)
</ins><span class="cx"> : m_assertionState(assertionState)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>