<!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>[185894] 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/185894">185894</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-23 17:50:36 -0700 (Tue, 23 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a class that tracks whether we're a background or foreground application
https://bugs.webkit.org/show_bug.cgi?id=146259
rdar://problem/19833808
Reviewed by Darin Adler.
First step towards being able to send out these notifications for view services.
* UIProcess/ApplicationStateTracker.h: Added.
(WebKit::ApplicationStateTracker::isInBackground):
* UIProcess/ApplicationStateTracker.mm: Added.
(WebKit::ApplicationStateTracker::singleton):
(WebKit::ApplicationStateTracker::ApplicationStateTracker):
(WebKit::ApplicationStateTracker::addListener):
(WebKit::ApplicationStateTracker::applicationDidEnterBackground):
(WebKit::ApplicationStateTracker::applicationWillEnterForeground):
(WebKit::ApplicationStateTracker::invokeListeners):
(WebKit::ApplicationStateTracker::pruneListeners):
* UIProcess/ios/ProcessAssertionIOS.mm:
(-[WKProcessAssertionBackgroundTaskManager init]):
(-[WKProcessAssertionBackgroundTaskManager _updateBackgroundTask]):
(-[WKProcessAssertionBackgroundTaskManager _applicationWillEnterForeground]):
(-[WKProcessAssertionBackgroundTaskManager _applicationDidEnterBackground]):
(-[WKProcessAssertionBackgroundTaskManager dealloc]): Deleted.
(-[WKProcessAssertionBackgroundTaskManager _applicationWillEnterForeground:]): Deleted.
(-[WKProcessAssertionBackgroundTaskManager _applicationDidEnterBackground:]): Deleted.
* UIProcess/ios/WKContentView.h:
* UIProcess/ios/WKContentView.mm:
(-[WKContentView _commonInitializationWithProcessPool:configuration:]):
(-[WKContentView isBackground]):
(-[WKContentView _applicationDidEnterBackground]):
(-[WKContentView _applicationWillEnterForeground]):
(-[WKContentView _applicationDidEnterBackground:]): Deleted.
(-[WKContentView _applicationWillEnterForeground:]): Deleted.
* WebKit2.xcodeproj/project.pbxproj:</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>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewh">trunk/Source/WebKit2/UIProcess/ios/WKContentView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessApplicationStateTrackerh">trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessApplicationStateTrackermm">trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185893 => 185894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-24 00:43:03 UTC (rev 185893)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-24 00:50:36 UTC (rev 185894)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2015-06-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Add a class that tracks whether we're a background or foreground application
+ https://bugs.webkit.org/show_bug.cgi?id=146259
+ rdar://problem/19833808
+
+ Reviewed by Darin Adler.
+
+ First step towards being able to send out these notifications for view services.
+
+ * UIProcess/ApplicationStateTracker.h: Added.
+ (WebKit::ApplicationStateTracker::isInBackground):
+ * UIProcess/ApplicationStateTracker.mm: Added.
+ (WebKit::ApplicationStateTracker::singleton):
+ (WebKit::ApplicationStateTracker::ApplicationStateTracker):
+ (WebKit::ApplicationStateTracker::addListener):
+ (WebKit::ApplicationStateTracker::applicationDidEnterBackground):
+ (WebKit::ApplicationStateTracker::applicationWillEnterForeground):
+ (WebKit::ApplicationStateTracker::invokeListeners):
+ (WebKit::ApplicationStateTracker::pruneListeners):
+ * UIProcess/ios/ProcessAssertionIOS.mm:
+ (-[WKProcessAssertionBackgroundTaskManager init]):
+ (-[WKProcessAssertionBackgroundTaskManager _updateBackgroundTask]):
+ (-[WKProcessAssertionBackgroundTaskManager _applicationWillEnterForeground]):
+ (-[WKProcessAssertionBackgroundTaskManager _applicationDidEnterBackground]):
+ (-[WKProcessAssertionBackgroundTaskManager dealloc]): Deleted.
+ (-[WKProcessAssertionBackgroundTaskManager _applicationWillEnterForeground:]): Deleted.
+ (-[WKProcessAssertionBackgroundTaskManager _applicationDidEnterBackground:]): Deleted.
+ * UIProcess/ios/WKContentView.h:
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView _commonInitializationWithProcessPool:configuration:]):
+ (-[WKContentView isBackground]):
+ (-[WKContentView _applicationDidEnterBackground]):
+ (-[WKContentView _applicationWillEnterForeground]):
+ (-[WKContentView _applicationDidEnterBackground:]): Deleted.
+ (-[WKContentView _applicationWillEnterForeground:]): Deleted.
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2015-06-23 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Remove windowResizerRect code, nobody is using it anymore
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=146265
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplicationStateTrackerh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.h (0 => 185894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.h 2015-06-24 00:50:36 UTC (rev 185894)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ApplicationStateTracker_h
+#define ApplicationStateTracker_h
+
+#if PLATFORM(IOS)
+
+#import "WeakObjCPtr.h"
+#import <wtf/Forward.h>
+#import <wtf/Vector.h>
+
+namespace WebKit {
+
+class ApplicationStateTracker {
+ friend NeverDestroyed<ApplicationStateTracker>;
+
+public:
+ static ApplicationStateTracker& singleton();
+
+ bool isInBackground() const { return m_isInBackground; }
+
+ void addListener(id, SEL willEnterForegroundSelector, SEL didEnterBackgroundSelector);
+
+private:
+ ApplicationStateTracker();
+ ~ApplicationStateTracker() = delete;
+
+ void applicationDidEnterBackground();
+ void applicationWillEnterForeground();
+
+ struct Listener;
+
+ void invokeListeners(SEL Listener::*);
+ void pruneListeners();
+
+ bool m_isInBackground;
+
+ struct Listener {
+ WeakObjCPtr<id> object;
+ SEL didEnterBackgroundSelector;
+ SEL willEnterForegroundSelector;
+ };
+ Vector<Listener> m_listeners;
+};
+
+}
+
+#endif
+
+#endif // ApplicationStateTracker_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplicationStateTrackermm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm (0 => 185894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm 2015-06-24 00:50:36 UTC (rev 185894)
</span><span class="lines">@@ -0,0 +1,115 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "ApplicationStateTracker.h"
+
+#if PLATFORM(IOS)
+
+#import <UIKit/UIApplication.h>
+#import <wtf/NeverDestroyed.h>
+#import <wtf/ObjcRuntimeExtras.h>
+
+namespace WebKit {
+
+ApplicationStateTracker& ApplicationStateTracker::singleton()
+{
+ static NeverDestroyed<ApplicationStateTracker> applicationStateTracker;
+
+ return applicationStateTracker;
+}
+
+ApplicationStateTracker::ApplicationStateTracker()
+{
+ UIApplication *application = [UIApplication sharedApplication];
+ NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+
+ m_isInBackground = application.applicationState == UIApplicationStateBackground;
+
+ [notificationCenter addObserverForName:UIApplicationDidEnterBackgroundNotification object:application queue:nil usingBlock:[this](NSNotification *) {
+ applicationDidEnterBackground();
+ }];
+
+ [notificationCenter addObserverForName:UIApplicationWillEnterForegroundNotification object:application queue:nil usingBlock:[this](NSNotification *) {
+ applicationWillEnterForeground();
+ }];
+}
+
+void ApplicationStateTracker::addListener(id object, SEL willEnterForegroundSelector, SEL didEnterBackgroundSelector)
+{
+ ASSERT([object respondsToSelector:willEnterForegroundSelector]);
+ ASSERT([object respondsToSelector:didEnterBackgroundSelector]);
+
+ m_listeners.append({ object, willEnterForegroundSelector, didEnterBackgroundSelector });
+}
+
+void ApplicationStateTracker::applicationDidEnterBackground()
+{
+ m_isInBackground = true;
+
+ invokeListeners(&Listener::didEnterBackgroundSelector);
+}
+
+void ApplicationStateTracker::applicationWillEnterForeground()
+{
+ m_isInBackground = false;
+
+ invokeListeners(&Listener::willEnterForegroundSelector);
+}
+
+void ApplicationStateTracker::invokeListeners(SEL Listener::* selector)
+{
+ bool shouldPruneListeners = false;
+
+ for (auto& listener : m_listeners) {
+ auto object = listener.object.get();
+ if (!object) {
+ shouldPruneListeners = true;
+ continue;
+ }
+
+ wtfObjcMsgSend<void>(object.get(), listener.*selector);
+ }
+
+ if (shouldPruneListeners)
+ pruneListeners();
+}
+
+void ApplicationStateTracker::pruneListeners()
+{
+ auto listeners = WTF::move(m_listeners);
+ ASSERT(m_listeners.isEmpty());
+
+ for (auto& listener : listeners) {
+ if (!listener.object)
+ continue;
+
+ m_listeners.append(WTF::move(listener));
+ }
+}
+
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosProcessAssertionIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm (185893 => 185894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2015-06-24 00:43:03 UTC (rev 185893)
+++ trunk/Source/WebKit2/UIProcess/ios/ProcessAssertionIOS.mm 2015-06-24 00:50:36 UTC (rev 185894)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#import "ApplicationStateTracker.h"
</ins><span class="cx"> #import "BKSProcessAssertionSPI.h"
</span><span class="cx"> #import <UIKit/UIApplication.h>
</span><span class="cx"> #import <wtf/HashSet.h>
</span><span class="lines">@@ -52,7 +53,6 @@
</span><span class="cx"> @implementation WKProcessAssertionBackgroundTaskManager
</span><span class="cx"> {
</span><span class="cx"> unsigned _needsToRunInBackgroundCount;
</span><del>- BOOL _appIsBackground;
</del><span class="cx"> UIBackgroundTaskIdentifier _backgroundTask;
</span><span class="cx"> HashSet<ProcessAssertionClient*> _clients;
</span><span class="cx"> }
</span><span class="lines">@@ -69,22 +69,15 @@
</span><span class="cx"> if (!self)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- _appIsBackground = [UIApplication sharedApplication].applicationState == UIApplicationStateBackground;
</del><span class="cx"> _backgroundTask = UIBackgroundTaskInvalid;
</span><span class="cx">
</span><del>- NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
- [center addObserver:self selector:@selector(_applicationWillEnterForeground:) name:UIApplicationWillEnterForegroundNotification object:nil];
- [center addObserver:self selector:@selector(_applicationDidEnterBackground:) name:UIApplicationDidEnterBackgroundNotification object:nil];
</del><ins>+ WebKit::ApplicationStateTracker::singleton().addListener(self, _applicationWillEnterForeground, _applicationDidEnterBackground);
</ins><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>- NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
- [center removeObserver:self name:UIApplicationWillEnterForegroundNotification object:nil];
- [center removeObserver:self name:UIApplicationDidEnterBackgroundNotification object:nil];
-
</del><span class="cx"> if (_backgroundTask != UIBackgroundTaskInvalid)
</span><span class="cx"> [[UIApplication sharedApplication] endBackgroundTask:_backgroundTask];
</span><span class="cx">
</span><span class="lines">@@ -103,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)_updateBackgroundTask
</span><span class="cx"> {
</span><del>- bool shouldHoldTask = _needsToRunInBackgroundCount && _appIsBackground;
</del><ins>+ bool shouldHoldTask = _needsToRunInBackgroundCount && WebKit::ApplicationStateTracker::singleton().isInBackground();
</ins><span class="cx">
</span><span class="cx"> if (shouldHoldTask && _backgroundTask == UIBackgroundTaskInvalid) {
</span><span class="cx"> _backgroundTask = [[UIApplication sharedApplication] beginBackgroundTaskWithName:@"com.apple.WebKit.ProcessAssertion" expirationHandler:^{
</span><span class="lines">@@ -123,15 +116,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_applicationWillEnterForeground:(NSNotification *)notification
</del><ins>+- (void)_applicationWillEnterForeground
</ins><span class="cx"> {
</span><del>- _appIsBackground = NO;
</del><span class="cx"> [self _updateBackgroundTask];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_applicationDidEnterBackground:(NSNotification *)notification
</del><ins>+- (void)_applicationDidEnterBackground
</ins><span class="cx"> {
</span><del>- _appIsBackground = YES;
</del><span class="cx"> [self _updateBackgroundTask];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.h (185893 => 185894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2015-06-24 00:43:03 UTC (rev 185893)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.h 2015-06-24 00:50:36 UTC (rev 185894)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> @package
</span><span class="cx"> RefPtr<WebKit::WebPageProxy> _page;
</span><span class="cx"> WKWebView *_webView;
</span><del>- BOOL _isBackground;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) WKBrowsingContextController *browsingContextController;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (185893 => 185894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-06-24 00:43:03 UTC (rev 185893)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-06-24 00:50:36 UTC (rev 185894)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><ins>+#import "ApplicationStateTracker.h"
</ins><span class="cx"> #import "PageClientImplIOS.h"
</span><span class="cx"> #import "RemoteLayerTreeDrawingAreaProxy.h"
</span><span class="cx"> #import "RemoteScrollingCoordinatorProxy.h"
</span><span class="lines">@@ -188,8 +189,6 @@
</span><span class="cx"> _page->setUseFixedLayout(true);
</span><span class="cx"> _page->setDelegatesScrolling(true);
</span><span class="cx">
</span><del>- _isBackground = [UIApplication sharedApplication].applicationState == UIApplicationStateBackground;
-
</del><span class="cx"> WebProcessPool::statistics().wkViewCount++;
</span><span class="cx">
</span><span class="cx"> _rootContentView = adoptNS([[UIView alloc] init]);
</span><span class="lines">@@ -211,8 +210,8 @@
</span><span class="cx">
</span><span class="cx"> self.layer.hitTestsAsOpaque = YES;
</span><span class="cx">
</span><del>- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationDidEnterBackground:) name:UIApplicationDidEnterBackgroundNotification object:[UIApplication sharedApplication]];
- [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillEnterForeground:) name:UIApplicationWillEnterForegroundNotification object:[UIApplication sharedApplication]];
</del><ins>+ ApplicationStateTracker::singleton().addListener(self, @selector(_applicationDidEnterBackground), @selector(_applicationWillEnterForeground));
+
</ins><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationWillResignActive:) name:UIApplicationWillResignActiveNotification object:[UIApplication sharedApplication]];
</span><span class="cx"> [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_applicationDidBecomeActive:) name:UIApplicationDidBecomeActiveNotification object:[UIApplication sharedApplication]];
</span><span class="cx">
</span><span class="lines">@@ -306,7 +305,7 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)isBackground
</span><span class="cx"> {
</span><del>- return _isBackground;
</del><ins>+ return ApplicationStateTracker::singleton().isInBackground();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_showInspectorHighlight:(const WebCore::Highlight&)highlight
</span><span class="lines">@@ -541,16 +540,14 @@
</span><span class="cx"> _page->applicationWillResignActive();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_applicationDidEnterBackground:(NSNotification*)notification
</del><ins>+- (void)_applicationDidEnterBackground
</ins><span class="cx"> {
</span><del>- _isBackground = YES;
</del><span class="cx"> _page->applicationDidEnterBackground();
</span><span class="cx"> _page->viewStateDidChange(ViewState::AllFlags & ~ViewState::IsInWindow);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_applicationWillEnterForeground:(NSNotification*)notification
</del><ins>+- (void)_applicationWillEnterForeground
</ins><span class="cx"> {
</span><del>- _isBackground = NO;
</del><span class="cx"> _page->applicationWillEnterForeground();
</span><span class="cx"> if (auto drawingArea = _page->drawingArea())
</span><span class="cx"> drawingArea->hideContentUntilNextUpdate();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (185893 => 185894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-24 00:43:03 UTC (rev 185893)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-06-24 00:50:36 UTC (rev 185894)
</span><span class="lines">@@ -444,6 +444,8 @@
</span><span class="cx"> 1AD25E96167AB08100EA9BCD /* DownloadProxyMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */; };
</span><span class="cx"> 1AD3306E16B1D991004F60E7 /* StorageAreaImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD3306C16B1D991004F60E7 /* StorageAreaImpl.cpp */; };
</span><span class="cx"> 1AD3306F16B1D991004F60E7 /* StorageAreaImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD3306D16B1D991004F60E7 /* StorageAreaImpl.h */; };
</span><ins>+ 1AD4C1921B39F33200ABC28E /* ApplicationStateTracker.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AD4C1901B39F33200ABC28E /* ApplicationStateTracker.mm */; };
+ 1AD4C1931B39F33200ABC28E /* ApplicationStateTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD4C1911B39F33200ABC28E /* ApplicationStateTracker.h */; };
</ins><span class="cx"> 1AD60F5D18E20F4C0020C034 /* WKWindowFeatures.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AD60F5B18E20F4C0020C034 /* WKWindowFeatures.mm */; };
</span><span class="cx"> 1AD60F5E18E20F4C0020C034 /* WKWindowFeatures.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD60F5C18E20F4C0020C034 /* WKWindowFeatures.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span class="cx"> 1AD60F6018E20F740020C034 /* WKWindowFeaturesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AD60F5F18E20F740020C034 /* WKWindowFeaturesInternal.h */; };
</span><span class="lines">@@ -2560,6 +2562,8 @@
</span><span class="cx"> 1AD25E94167AB08100EA9BCD /* DownloadProxyMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadProxyMap.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AD3306C16B1D991004F60E7 /* StorageAreaImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaImpl.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AD3306D16B1D991004F60E7 /* StorageAreaImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaImpl.h; sourceTree = "<group>"; };
</span><ins>+ 1AD4C1901B39F33200ABC28E /* ApplicationStateTracker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ApplicationStateTracker.mm; sourceTree = "<group>"; };
+ 1AD4C1911B39F33200ABC28E /* ApplicationStateTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationStateTracker.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1AD60F5B18E20F4C0020C034 /* WKWindowFeatures.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWindowFeatures.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1AD60F5C18E20F4C0020C034 /* WKWindowFeatures.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWindowFeatures.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AD60F5F18E20F740020C034 /* WKWindowFeaturesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWindowFeaturesInternal.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5103,6 +5107,8 @@
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><span class="cx"> C54256AE18BEC16100DE4179 /* forms */,
</span><ins>+ 1AD4C1911B39F33200ABC28E /* ApplicationStateTracker.h */,
+ 1AD4C1901B39F33200ABC28E /* ApplicationStateTracker.mm */,
</ins><span class="cx"> A115DC6E191D82AB00DA8072 /* _WKWebViewPrintFormatter.h */,
</span><span class="cx"> A115DC6D191D82AB00DA8072 /* _WKWebViewPrintFormatter.mm */,
</span><span class="cx"> 0F0C365D18C110A500F607D7 /* LayerRepresentation.mm */,
</span><span class="lines">@@ -8349,6 +8355,7 @@
</span><span class="cx"> 1A66BF8F18A052ED002071B4 /* WKWebViewInternal.h in Headers */,
</span><span class="cx"> 26F9A83B18A3468100AEB88A /* WKWebViewPrivate.h in Headers */,
</span><span class="cx"> 1AD60F5E18E20F4C0020C034 /* WKWindowFeatures.h in Headers */,
</span><ins>+ 1AD4C1931B39F33200ABC28E /* ApplicationStateTracker.h in Headers */,
</ins><span class="cx"> 1AD60F6018E20F740020C034 /* WKWindowFeaturesInternal.h in Headers */,
</span><span class="cx"> BCBECDE816B6416800047A1A /* XPCServiceEntryPoint.h in Headers */,
</span><span class="cx"> );
</span><span class="lines">@@ -9579,6 +9586,7 @@
</span><span class="cx"> 1AEFCC1311D01F96008219D3 /* PluginInfoStore.cpp in Sources */,
</span><span class="cx"> 1AEFCCBD11D02C5E008219D3 /* PluginInfoStoreMac.mm in Sources */,
</span><span class="cx"> 1A043977124D034800FFBFB5 /* PluginProcess.cpp in Sources */,
</span><ins>+ 1AD4C1921B39F33200ABC28E /* ApplicationStateTracker.mm in Sources */,
</ins><span class="cx"> 1A0EC907124C0AB8007EF4A5 /* PluginProcessConnection.cpp in Sources */,
</span><span class="cx"> 1A0EC910124C0AF5007EF4A5 /* PluginProcessConnectionManager.cpp in Sources */,
</span><span class="cx"> 1A7865B916CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>