<!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>[171664] branches/safari-600.1-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/171664">171664</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-27 17:45:01 -0700 (Sun, 27 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171663">r171663</a>. <rdar://problem/17818308></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosPageClientImplIOSmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosProcessAssertionIOSmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosWKContentViewh">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessiosWKContentViewmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171663 => 171664)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-27 23:36:23 UTC (rev 171663)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-28 00:45:01 UTC (rev 171664)
</span><span class="lines">@@ -1,5 +1,40 @@
</span><span class="cx"> 2014-07-27 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171663. <rdar://problem/17818308>
+
+ 2014-07-27 Gavin Barraclough <baraclough@apple.com>
+
+ Don't rely on reading applicationState from within DidEnterBackground/WillEnterForeground
+ https://bugs.webkit.org/show_bug.cgi?id=135329
+ rdar://problem/17818308
+
+ Reviewed by Sam Weinig.
+
+ API may not be stable.
+
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::isViewVisible):
+ - changed to use -[WKContentView isBackground]
+ * UIProcess/ios/ProcessAssertionIOS.mm:
+ (-[WKProcessAssertionBackgroundTaskManager init]):
+ - split notification handlers
+ (-[WKProcessAssertionBackgroundTaskManager _applicationWillEnterForeground:]):
+ (-[WKProcessAssertionBackgroundTaskManager _applicationDidEnterBackground:]):
+ (-[WKProcessAssertionBackgroundTaskManager _applicationDidEnterBackgroundOrWillEnterForeground:]): Deleted.
+ - Assume application is background is after DidEnterBackground, and not after WillEnterForeground
+ * UIProcess/ios/WKContentView.h:
+ - added isBackground.
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView initWithFrame:context:configuration:webView:]):
+ - check applicationState at init.
+ (-[WKContentView isBackground]):
+ - accessor
+ (-[WKContentView _applicationDidEnterBackground:]):
+ (-[WKContentView _applicationWillEnterForeground:]):
+ - update isBackground
+
+2014-07-27 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r171651. <rdar://problem/17682120>
</span><span class="cx">
</span><span class="cx"> 2014-07-26 Enrica Casucci <enrica@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (171663 => 171664)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-07-27 23:36:23 UTC (rev 171663)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2014-07-28 00:45:01 UTC (rev 171664)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx">
</span><span class="cx"> bool PageClientImpl::isViewVisible()
</span><span class="cx"> {
</span><del>- return isViewInWindow() && [UIApplication sharedApplication].applicationState != UIApplicationStateBackground;
</del><ins>+ return isViewInWindow() && !m_contentView.isBackground;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool PageClientImpl::isViewInWindow()
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosProcessAssertionIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm (171663 => 171664)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2014-07-27 23:36:23 UTC (rev 171663)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2014-07-28 00:45:01 UTC (rev 171664)
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx"> _backgroundTask = UIBackgroundTaskInvalid;
</span><span class="cx">
</span><span class="cx"> NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
</span><del>- [center addObserver:self selector:@selector(_applicationDidEnterBackgroundOrWillEnterForeground:) name:UIApplicationWillEnterForegroundNotification object:nil];
- [center addObserver:self selector:@selector(_applicationDidEnterBackgroundOrWillEnterForeground:) name:UIApplicationDidEnterBackgroundNotification object:nil];
</del><ins>+ [center addObserver:self selector:@selector(_applicationWillEnterForeground:) name:UIApplicationWillEnterForegroundNotification object:nil];
+ [center addObserver:self selector:@selector(_applicationDidEnterBackground:) name:UIApplicationDidEnterBackgroundNotification object:nil];
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -101,12 +101,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_applicationDidEnterBackgroundOrWillEnterForeground:(NSNotification *)notification
</del><ins>+- (void)_applicationWillEnterForeground:(NSNotification *)notification
</ins><span class="cx"> {
</span><del>- _appIsBackground = [UIApplication sharedApplication].applicationState == UIApplicationStateBackground;
</del><ins>+ _appIsBackground = NO;
</ins><span class="cx"> [self _updateBackgroundTask];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_applicationDidEnterBackground:(NSNotification *)notification
+{
+ _appIsBackground = YES;
+ [self _updateBackgroundTask];
+}
+
</ins><span class="cx"> - (void)incrementNeedsToRunInBackgroundCount
</span><span class="cx"> {
</span><span class="cx"> ++_needsToRunInBackgroundCount;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosWKContentViewh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.h (171663 => 171664)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.h 2014-07-27 23:36:23 UTC (rev 171663)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.h 2014-07-28 00:45:01 UTC (rev 171664)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> @package
</span><span class="cx"> RefPtr<WebKit::WebPageProxy> _page;
</span><span class="cx"> WKWebView *_webView;
</span><ins>+ BOOL _isBackground;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) WKBrowsingContextController *browsingContextController;
</span><span class="lines">@@ -60,6 +61,7 @@
</span><span class="cx"> @property (nonatomic, readonly) WebKit::WebPageProxy* page;
</span><span class="cx"> @property (nonatomic, readonly) BOOL isAssistingNode;
</span><span class="cx"> @property (nonatomic, getter=isShowingInspectorIndication) BOOL showingInspectorIndication;
</span><ins>+@property (nonatomic, readonly) BOOL isBackground;
</ins><span class="cx">
</span><span class="cx"> - (instancetype)initWithFrame:(CGRect)frame context:(WebKit::WebContext&)context configuration:(WebKit::WebPageConfiguration)webPageConfiguration webView:(WKWebView *)webView;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm (171663 => 171664)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-07-27 23:36:23 UTC (rev 171663)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/ios/WKContentView.mm 2014-07-28 00:45:01 UTC (rev 171664)
</span><span class="lines">@@ -201,6 +201,8 @@
</span><span class="cx"> _page->setDelegatesScrolling(true);
</span><span class="cx">
</span><span class="cx"> _webView = webView;
</span><ins>+
+ _isBackground = [UIApplication sharedApplication].applicationState == UIApplicationStateBackground;
</ins><span class="cx">
</span><span class="cx"> WebContext::statistics().wkViewCount++;
</span><span class="cx">
</span><span class="lines">@@ -286,6 +288,11 @@
</span><span class="cx"> return [self isEditable];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)isBackground
+{
+ return _isBackground;
+}
+
</ins><span class="cx"> - (void)_showInspectorHighlight:(const WebCore::Highlight&)highlight
</span><span class="cx"> {
</span><span class="cx"> if (!_inspectorHighlightView) {
</span><span class="lines">@@ -504,11 +511,13 @@
</span><span class="cx">
</span><span class="cx"> - (void)_applicationDidEnterBackground:(NSNotification*)notification
</span><span class="cx"> {
</span><ins>+ _isBackground = YES;
</ins><span class="cx"> _page->viewStateDidChange(ViewState::AllFlags & ~ViewState::IsInWindow);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_applicationWillEnterForeground:(NSNotification*)notification
</span><span class="cx"> {
</span><ins>+ _isBackground = NO;
</ins><span class="cx"> _page->applicationWillEnterForeground();
</span><span class="cx"> if (auto drawingArea = _page->drawingArea())
</span><span class="cx"> drawingArea->hideContentUntilNextUpdate();
</span></span></pre>
</div>
</div>
</body>
</html>