<!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>[186523] 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/186523">186523</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-07-08 13:36:09 -0700 (Wed, 08 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make ApplicationStateTracker be per view instead of being a singleton
https://bugs.webkit.org/show_bug.cgi?id=146737
Reviewed by Andreas Kling.
* UIProcess/ApplicationStateTracker.h:
Update to be per view instead of a singleton.
* UIProcess/ApplicationStateTracker.mm:
(WebKit::ApplicationStateTracker::ApplicationStateTracker):
Change to take a view + selectors.
(WebKit::ApplicationStateTracker::~ApplicationStateTracker):
Invalidate the state monitor and remove the listeners.
(WebKit::ApplicationStateTracker::applicationDidEnterBackground):
Just call the single background method.
(WebKit::ApplicationStateTracker::applicationWillEnterForeground):
Just call the single foreground method.
(WebKit::ApplicationStateTracker::singleton): Deleted.
(WebKit::ApplicationStateTracker::addListener): Deleted.
(WebKit::ApplicationStateTracker::invokeListeners): Deleted.
(WebKit::ApplicationStateTracker::pruneListeners): Deleted.
* UIProcess/ios/WKContentView.mm:
(-[WKContentView _commonInitializationWithProcessPool:configuration:]):
Create the ApplicationStateTracker here.
(-[WKContentView isBackground]):
Get the ivar instead of the singleton.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformspiiosAssertionServicesSPIh">trunk/Source/WebKit2/Platform/spi/ios/AssertionServicesSPI.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessApplicationStateTrackerh">trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessApplicationStateTrackermm">trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewmm">trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186522 => 186523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-08 20:20:09 UTC (rev 186522)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-08 20:36:09 UTC (rev 186523)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2015-07-08 Anders Carlsson <andersca@apple.com>
+
+ Make ApplicationStateTracker be per view instead of being a singleton
+ https://bugs.webkit.org/show_bug.cgi?id=146737
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/ApplicationStateTracker.h:
+ Update to be per view instead of a singleton.
+
+ * UIProcess/ApplicationStateTracker.mm:
+ (WebKit::ApplicationStateTracker::ApplicationStateTracker):
+ Change to take a view + selectors.
+
+ (WebKit::ApplicationStateTracker::~ApplicationStateTracker):
+ Invalidate the state monitor and remove the listeners.
+
+ (WebKit::ApplicationStateTracker::applicationDidEnterBackground):
+ Just call the single background method.
+
+ (WebKit::ApplicationStateTracker::applicationWillEnterForeground):
+ Just call the single foreground method.
+
+ (WebKit::ApplicationStateTracker::singleton): Deleted.
+ (WebKit::ApplicationStateTracker::addListener): Deleted.
+ (WebKit::ApplicationStateTracker::invokeListeners): Deleted.
+ (WebKit::ApplicationStateTracker::pruneListeners): Deleted.
+
+ * UIProcess/ios/WKContentView.mm:
+ (-[WKContentView _commonInitializationWithProcessPool:configuration:]):
+ Create the ApplicationStateTracker here.
+
+ (-[WKContentView isBackground]):
+ Get the ivar instead of the singleton.
+
</ins><span class="cx"> 2015-07-08 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> InteractionInformationAtPosition bounds seem wrong on many sites, affects
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosAssertionServicesSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/AssertionServicesSPI.h (186522 => 186523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/AssertionServicesSPI.h 2015-07-08 20:20:09 UTC (rev 186522)
+++ trunk/Source/WebKit2/Platform/spi/ios/AssertionServicesSPI.h 2015-07-08 20:36:09 UTC (rev 186523)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> @property (nonatomic, copy) BKSApplicationStateChangedHandler handler;
</span><span class="cx">
</span><span class="cx"> - (BKSApplicationState)mostElevatedApplicationStateForPID:(pid_t)pid;
</span><ins>+- (void)invalidate;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplicationStateTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.h (186522 => 186523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.h 2015-07-08 20:20:09 UTC (rev 186522)
+++ trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.h 2015-07-08 20:36:09 UTC (rev 186523)
</span><span class="lines">@@ -30,40 +30,36 @@
</span><span class="cx">
</span><span class="cx"> #import "WeakObjCPtr.h"
</span><span class="cx"> #import <wtf/Forward.h>
</span><del>-#import <wtf/Vector.h>
</del><ins>+#import <wtf/WeakPtr.h>
</ins><span class="cx">
</span><ins>+OBJC_CLASS BKSApplicationStateMonitor;
+OBJC_CLASS UIView;
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class ApplicationStateTracker {
</span><del>- friend NeverDestroyed<ApplicationStateTracker>;
-
</del><span class="cx"> public:
</span><del>- static ApplicationStateTracker& singleton();
</del><ins>+ ApplicationStateTracker(UIView *, SEL didEnterBackgroundSelector, SEL willEnterForegroundSelector);
+ ~ApplicationStateTracker();
</ins><span class="cx">
</span><span class="cx"> bool isInBackground() const { return m_isInBackground; }
</span><span class="cx">
</span><del>- void addListener(id, SEL willEnterForegroundSelector, SEL didEnterBackgroundSelector);
-
</del><span class="cx"> private:
</span><del>- ApplicationStateTracker();
- ~ApplicationStateTracker() = delete;
-
</del><span class="cx"> void applicationDidEnterBackground();
</span><span class="cx"> void applicationWillEnterForeground();
</span><span class="cx">
</span><del>- struct Listener;
</del><ins>+ WeakObjCPtr<UIView> m_view;
+ SEL m_didEnterBackgroundSelector;
+ SEL m_willEnterForegroundSelector;
</ins><span class="cx">
</span><del>- void invokeListeners(SEL Listener::*);
- void pruneListeners();
-
</del><span class="cx"> bool m_isInBackground;
</span><span class="cx">
</span><del>- struct Listener {
- WeakObjCPtr<id> object;
- SEL didEnterBackgroundSelector;
- SEL willEnterForegroundSelector;
- };
- Vector<Listener> m_listeners;
</del><ins>+ WeakPtrFactory<ApplicationStateTracker> m_weakPtrFactory;
+
+ RetainPtr<BKSApplicationStateMonitor> m_applicationStateMonitor;
+
+ id m_didEnterBackgroundObserver;
+ id m_willEnterForegroundObserver;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessApplicationStateTrackermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm (186522 => 186523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm 2015-07-08 20:20:09 UTC (rev 186522)
+++ trunk/Source/WebKit2/UIProcess/ApplicationStateTracker.mm 2015-07-08 20:36:09 UTC (rev 186523)
</span><span class="lines">@@ -37,13 +37,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-ApplicationStateTracker& ApplicationStateTracker::singleton()
-{
- static NeverDestroyed<ApplicationStateTracker> applicationStateTracker;
-
- return applicationStateTracker;
-}
-
</del><span class="cx"> static bool hasEntitlement(NSString *entitlement)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS_SIMULATOR)
</span><span class="lines">@@ -88,14 +81,24 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ApplicationStateTracker::ApplicationStateTracker()
</del><ins>+ApplicationStateTracker::ApplicationStateTracker(UIView *view, SEL didEnterBackgroundSelector, SEL willEnterForegroundSelector)
+ : m_view(view)
+ , m_didEnterBackgroundSelector(didEnterBackgroundSelector)
+ , m_willEnterForegroundSelector(willEnterForegroundSelector)
+ , m_weakPtrFactory(this)
+ , m_didEnterBackgroundObserver(nullptr)
+ , m_willEnterForegroundObserver(nullptr)
</ins><span class="cx"> {
</span><ins>+ ASSERT([m_view.get() respondsToSelector:m_didEnterBackgroundSelector]);
+ ASSERT([m_view.get() respondsToSelector:m_willEnterForegroundSelector]);
+
</ins><span class="cx"> if (isViewService()) {
</span><del>- BKSApplicationStateMonitor *applicationStateMonitor = [[BKSApplicationStateMonitor alloc] init];
</del><ins>+ m_applicationStateMonitor = adoptNS([[BKSApplicationStateMonitor alloc] init]);
</ins><span class="cx">
</span><del>- m_isInBackground = isBackgroundState([applicationStateMonitor mostElevatedApplicationStateForPID:getpid()]);
</del><ins>+ m_isInBackground = isBackgroundState([m_applicationStateMonitor mostElevatedApplicationStateForPID:getpid()]);
</ins><span class="cx">
</span><del>- applicationStateMonitor.handler = [this](NSDictionary *userInfo) {
</del><ins>+ auto weakThis = m_weakPtrFactory.createWeakPtr();
+ [m_applicationStateMonitor setHandler:[weakThis](NSDictionary *userInfo) {
</ins><span class="cx"> pid_t pid = [userInfo[BKSApplicationStateProcessIDKey] integerValue];
</span><span class="cx"> if (pid != getpid())
</span><span class="cx"> return;
</span><span class="lines">@@ -103,82 +106,62 @@
</span><span class="cx"> BKSApplicationState newState = (BKSApplicationState)[userInfo[BKSApplicationStateMostElevatedStateForProcessIDKey] unsignedIntValue];
</span><span class="cx"> bool newInBackground = isBackgroundState(newState);
</span><span class="cx">
</span><del>- dispatch_async(dispatch_get_main_queue(), [this, newInBackground] {
- if (!m_isInBackground && newInBackground)
- applicationDidEnterBackground();
- else if (m_isInBackground && !newInBackground)
- applicationWillEnterForeground();
</del><ins>+ dispatch_async(dispatch_get_main_queue(), [weakThis, newInBackground] {
+ auto applicationStateTracker = weakThis.get();
+ if (!applicationStateTracker)
+ return;
+
+ if (!applicationStateTracker->m_isInBackground && newInBackground)
+ applicationStateTracker->applicationDidEnterBackground();
+ else if (applicationStateTracker->m_isInBackground && !newInBackground)
+ applicationStateTracker->applicationWillEnterForeground();
</ins><span class="cx"> });
</span><del>- };
</del><ins>+ }];
</ins><span class="cx"> } else {
</span><span class="cx"> UIApplication *application = [UIApplication sharedApplication];
</span><span class="cx"> NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
</span><span class="cx">
</span><span class="cx"> m_isInBackground = application.applicationState == UIApplicationStateBackground;
</span><span class="cx">
</span><del>- [notificationCenter addObserverForName:UIApplicationDidEnterBackgroundNotification object:application queue:nil usingBlock:[this](NSNotification *) {
</del><ins>+ m_didEnterBackgroundObserver = [notificationCenter addObserverForName:UIApplicationDidEnterBackgroundNotification object:application queue:nil usingBlock:[this](NSNotification *) {
</ins><span class="cx"> applicationDidEnterBackground();
</span><span class="cx"> }];
</span><span class="cx">
</span><del>- [notificationCenter addObserverForName:UIApplicationWillEnterForegroundNotification object:application queue:nil usingBlock:[this](NSNotification *) {
</del><ins>+ m_willEnterForegroundObserver = [notificationCenter addObserverForName:UIApplicationWillEnterForegroundNotification object:application queue:nil usingBlock:[this](NSNotification *) {
</ins><span class="cx"> applicationWillEnterForeground();
</span><span class="cx"> }];
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ApplicationStateTracker::addListener(id object, SEL willEnterForegroundSelector, SEL didEnterBackgroundSelector)
</del><ins>+ApplicationStateTracker::~ApplicationStateTracker()
</ins><span class="cx"> {
</span><del>- ASSERT([object respondsToSelector:willEnterForegroundSelector]);
- ASSERT([object respondsToSelector:didEnterBackgroundSelector]);
</del><ins>+ if (m_applicationStateMonitor) {
+ [m_applicationStateMonitor invalidate];
+ return;
+ }
</ins><span class="cx">
</span><del>- m_listeners.append({ object, willEnterForegroundSelector, didEnterBackgroundSelector });
</del><ins>+ NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+ [notificationCenter removeObserver:m_didEnterBackgroundObserver];
+ [notificationCenter removeObserver:m_willEnterForegroundObserver];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationStateTracker::applicationDidEnterBackground()
</span><span class="cx"> {
</span><span class="cx"> m_isInBackground = true;
</span><span class="cx">
</span><del>- invokeListeners(&Listener::didEnterBackgroundSelector);
</del><ins>+ if (auto view = m_view.get())
+ wtfObjcMsgSend<void>(view.get(), m_didEnterBackgroundSelector);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationStateTracker::applicationWillEnterForeground()
</span><span class="cx"> {
</span><span class="cx"> m_isInBackground = false;
</span><span class="cx">
</span><del>- invokeListeners(&Listener::willEnterForegroundSelector);
</del><ins>+ if (auto view = m_view.get())
+ wtfObjcMsgSend<void>(view.get(), m_willEnterForegroundSelector);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-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();
</del><span class="cx"> }
</span><span class="cx">
</span><del>-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));
- }
-}
-
-}
-
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm (186522 => 186523)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-07-08 20:20:09 UTC (rev 186522)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentView.mm 2015-07-08 20:36:09 UTC (rev 186523)
</span><span class="lines">@@ -177,6 +177,8 @@
</span><span class="cx"> HistoricalVelocityData _historicalKinematicData;
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSUndoManager> _undoManager;
</span><ins>+
+ std::unique_ptr<ApplicationStateTracker> _applicationStateTracker;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)_commonInitializationWithProcessPool:(WebKit::WebProcessPool&)processPool configuration:(WebKit::WebPageConfiguration)webPageConfiguration
</span><span class="lines">@@ -210,7 +212,7 @@
</span><span class="cx">
</span><span class="cx"> self.layer.hitTestsAsOpaque = YES;
</span><span class="cx">
</span><del>- ApplicationStateTracker::singleton().addListener(self, @selector(_applicationDidEnterBackground), @selector(_applicationWillEnterForeground));
</del><ins>+ _applicationStateTracker = std::make_unique<ApplicationStateTracker>(self, @selector(_applicationDidEnterBackground), @selector(_applicationWillEnterForeground));
</ins><span class="cx">
</span><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="lines">@@ -305,7 +307,7 @@
</span><span class="cx">
</span><span class="cx"> - (BOOL)isBackground
</span><span class="cx"> {
</span><del>- return ApplicationStateTracker::singleton().isInBackground();
</del><ins>+ return _applicationStateTracker->isInBackground();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)_showInspectorHighlight:(const WebCore::Highlight&)highlight
</span></span></pre>
</div>
</div>
</body>
</html>