<!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>[202690] trunk/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/202690">202690</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2016-06-30 11:15:47 -0700 (Thu, 30 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup ProcessAssertion RunInBackground management
https://bugs.webkit.org/show_bug.cgi?id=159284
Reviewed by Chris Dumez.
Factor out code that handles taking a background assertion on the UI app into
ProcessAndUIAssertion::updateRunInBackgroundCount helper.
This patch just cleanup to enable a futher fix.
* UIProcess/ProcessAssertion.h:
(WebKit::ProcessAssertion::state):
- Added ProcessAndUIAssertion::updateRunInBackgroundCount
- Added ProcessAndUIAssertion::m_isHoldingBackgroundAssertionOnApp
* UIProcess/ios/ProcessAssertionIOS.mm:
(WebKit::ProcessAndUIAssertion::updateRunInBackgroundCount):
- helper to manage calls to incrementNeedsToRunInBackgroundCount/decrementNeedsToRunInBackgroundCount
(WebKit::ProcessAndUIAssertion::ProcessAndUIAssertion):
- call updateRunInBackgroundCount
(WebKit::ProcessAndUIAssertion::~ProcessAndUIAssertion):
changed to use m_isHoldingBackgroundAssertionOnApp
(WebKit::ProcessAndUIAssertion::setState):
- call updateRunInBackgroundCount</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessProcessAssertionh">trunk/Source/WebKit2/UIProcess/ProcessAssertion.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosProcessAssertionIOSmm">trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202689 => 202690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-30 18:13:26 UTC (rev 202689)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-30 18:15:47 UTC (rev 202690)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-06-29 Gavin Barraclough <barraclough@apple.com>
+
+ Cleanup ProcessAssertion RunInBackground management
+ https://bugs.webkit.org/show_bug.cgi?id=159284
+
+ Reviewed by Chris Dumez.
+
+ Factor out code that handles taking a background assertion on the UI app into
+ ProcessAndUIAssertion::updateRunInBackgroundCount helper.
+
+ This patch just cleanup to enable a futher fix.
+
+ * UIProcess/ProcessAssertion.h:
+ (WebKit::ProcessAssertion::state):
+ - Added ProcessAndUIAssertion::updateRunInBackgroundCount
+ - Added ProcessAndUIAssertion::m_isHoldingBackgroundAssertionOnApp
+ * UIProcess/ios/ProcessAssertionIOS.mm:
+ (WebKit::ProcessAndUIAssertion::updateRunInBackgroundCount):
+ - helper to manage calls to incrementNeedsToRunInBackgroundCount/decrementNeedsToRunInBackgroundCount
+ (WebKit::ProcessAndUIAssertion::ProcessAndUIAssertion):
+ - call updateRunInBackgroundCount
+ (WebKit::ProcessAndUIAssertion::~ProcessAndUIAssertion):
+ changed to use m_isHoldingBackgroundAssertionOnApp
+ (WebKit::ProcessAndUIAssertion::setState):
+ - call updateRunInBackgroundCount
+
</ins><span class="cx"> 2016-06-30 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Coordinated Graphics] Move CompositingCoordinator from platform to WebKit2 layer
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessAssertionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ProcessAssertion.h (202689 => 202690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessAssertion.h 2016-06-30 18:13:26 UTC (rev 202689)
+++ trunk/Source/WebKit2/UIProcess/ProcessAssertion.h 2016-06-30 18:15:47 UTC (rev 202690)
</span><span class="lines">@@ -72,6 +72,13 @@
</span><span class="cx"> void setClient(ProcessAssertionClient&);
</span><span class="cx">
</span><span class="cx"> void setState(AssertionState);
</span><ins>+
+#if PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
+private:
+ void updateRunInBackgroundCount();
+
+ bool m_isHoldingBackgroundAssertion { false };
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosProcessAssertionIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm (202689 => 202690)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2016-06-30 18:13:26 UTC (rev 202689)
+++ trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2016-06-30 18:15:47 UTC (rev 202690)
</span><span class="lines">@@ -172,27 +172,37 @@
</span><span class="cx"> [m_assertion setFlags:flagsForState(assertionState)];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ProcessAndUIAssertion::updateRunInBackgroundCount()
+{
+ bool shouldHoldBackgroundAssertion = state() != AssertionState::Suspended;
+
+ if (shouldHoldBackgroundAssertion) {
+ if (!m_isHoldingBackgroundAssertion)
+ [[WKProcessAssertionBackgroundTaskManager shared] incrementNeedsToRunInBackgroundCount];
+ } else {
+ if (m_isHoldingBackgroundAssertion)
+ [[WKProcessAssertionBackgroundTaskManager shared] decrementNeedsToRunInBackgroundCount];
+ }
+
+ m_isHoldingBackgroundAssertion = shouldHoldBackgroundAssertion;
+}
+
</ins><span class="cx"> ProcessAndUIAssertion::ProcessAndUIAssertion(pid_t pid, AssertionState assertionState)
</span><span class="cx"> : ProcessAssertion(pid, assertionState)
</span><span class="cx"> {
</span><del>- if (assertionState != AssertionState::Suspended)
- [[WKProcessAssertionBackgroundTaskManager shared] incrementNeedsToRunInBackgroundCount];
</del><ins>+ updateRunInBackgroundCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ProcessAndUIAssertion::~ProcessAndUIAssertion()
</span><span class="cx"> {
</span><del>- if (state() != AssertionState::Suspended)
</del><ins>+ if (m_isHoldingBackgroundAssertion)
</ins><span class="cx"> [[WKProcessAssertionBackgroundTaskManager shared] decrementNeedsToRunInBackgroundCount];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ProcessAndUIAssertion::setState(AssertionState assertionState)
</span><span class="cx"> {
</span><del>- if ((state() == AssertionState::Suspended) && (assertionState != AssertionState::Suspended))
- [[WKProcessAssertionBackgroundTaskManager shared] incrementNeedsToRunInBackgroundCount];
- if ((state() != AssertionState::Suspended) && (assertionState == AssertionState::Suspended))
- [[WKProcessAssertionBackgroundTaskManager shared] decrementNeedsToRunInBackgroundCount];
-
</del><span class="cx"> ProcessAssertion::setState(assertionState);
</span><ins>+ updateRunInBackgroundCount();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ProcessAndUIAssertion::setClient(ProcessAssertionClient& newClient)
</span></span></pre>
</div>
</div>
</body>
</html>