<!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>[186512] 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/186512">186512</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-07-08 10:24:01 -0700 (Wed, 08 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Always begin a background task when needed, not just when we go into the background
https://bugs.webkit.org/show_bug.cgi?id=146704
Reviewed by Gavin Barraclough.
The system let background code run for the same amount of time regardless of whether the assertion was grabbed
when the app is in the foreground or being backgrounded, so remove the background/foreground tracking code.
* UIProcess/ios/ProcessAssertionIOS.mm:
(-[WKProcessAssertionBackgroundTaskManager _updateBackgroundTask]):
(-[WKProcessAssertionBackgroundTaskManager init]): Deleted.
(-[WKProcessAssertionBackgroundTaskManager _applicationWillEnterForeground]): Deleted.
(-[WKProcessAssertionBackgroundTaskManager _applicationDidEnterBackground]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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 (186511 => 186512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-08 17:18:03 UTC (rev 186511)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-08 17:24:01 UTC (rev 186512)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-07-07 Anders Carlsson <andersca@apple.com>
+
+ Always begin a background task when needed, not just when we go into the background
+ https://bugs.webkit.org/show_bug.cgi?id=146704
+
+ Reviewed by Gavin Barraclough.
+
+ The system let background code run for the same amount of time regardless of whether the assertion was grabbed
+ when the app is in the foreground or being backgrounded, so remove the background/foreground tracking code.
+
+ * UIProcess/ios/ProcessAssertionIOS.mm:
+ (-[WKProcessAssertionBackgroundTaskManager _updateBackgroundTask]):
+ (-[WKProcessAssertionBackgroundTaskManager init]): Deleted.
+ (-[WKProcessAssertionBackgroundTaskManager _applicationWillEnterForeground]): Deleted.
+ (-[WKProcessAssertionBackgroundTaskManager _applicationDidEnterBackground]): Deleted.
+
</ins><span class="cx"> 2015-07-08 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Network Cache: Don't open files in main thread
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosProcessAssertionIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm (186511 => 186512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2015-07-08 17:18:03 UTC (rev 186511)
+++ trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2015-07-08 17:24:01 UTC (rev 186512)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><del>-#import "ApplicationStateTracker.h"
</del><span class="cx"> #import "AssertionServicesSPI.h"
</span><span class="cx"> #import <UIKit/UIApplication.h>
</span><span class="cx"> #import <wtf/HashSet.h>
</span><span class="lines">@@ -71,8 +70,6 @@
</span><span class="cx">
</span><span class="cx"> _backgroundTask = UIBackgroundTaskInvalid;
</span><span class="cx">
</span><del>- WebKit::ApplicationStateTracker::singleton().addListener(self, @selector(_applicationWillEnterForeground), @selector(_applicationDidEnterBackground));
-
</del><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -96,9 +93,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_updateBackgroundTask
</span><span class="cx"> {
</span><del>- bool shouldHoldTask = _needsToRunInBackgroundCount && WebKit::ApplicationStateTracker::singleton().isInBackground();
-
- if (shouldHoldTask && _backgroundTask == UIBackgroundTaskInvalid) {
</del><ins>+ if (_needsToRunInBackgroundCount && _backgroundTask == UIBackgroundTaskInvalid) {
</ins><span class="cx"> _backgroundTask = [[UIApplication sharedApplication] beginBackgroundTaskWithName:@"com.apple.WebKit.ProcessAssertion" expirationHandler:^{
</span><span class="cx"> NSLog(@"Background task expired while holding WebKit ProcessAssertion.");
</span><span class="cx"> Vector<ProcessAssertionClient*> clientsToNotify;
</span><span class="lines">@@ -110,22 +105,12 @@
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!shouldHoldTask && _backgroundTask != UIBackgroundTaskInvalid) {
</del><ins>+ if (!_needsToRunInBackgroundCount && _backgroundTask != UIBackgroundTaskInvalid) {
</ins><span class="cx"> [[UIApplication sharedApplication] endBackgroundTask:_backgroundTask];
</span><span class="cx"> _backgroundTask = UIBackgroundTaskInvalid;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_applicationWillEnterForeground
-{
- [self _updateBackgroundTask];
-}
-
-- (void)_applicationDidEnterBackground
-{
- [self _updateBackgroundTask];
-}
-
</del><span class="cx"> - (void)incrementNeedsToRunInBackgroundCount
</span><span class="cx"> {
</span><span class="cx"> ++_needsToRunInBackgroundCount;
</span></span></pre>
</div>
</div>
</body>
</html>