Title: [191023] branches/safari-601.1.46.25-branch/Source/WebKit2
- Revision
- 191023
- Author
- [email protected]
- Date
- 2015-10-13 17:29:35 -0700 (Tue, 13 Oct 2015)
Log Message
Merged r191022. rdar://problem/23100514
Modified Paths
Diff
Modified: branches/safari-601.1.46.25-branch/Source/WebKit2/ChangeLog (191022 => 191023)
--- branches/safari-601.1.46.25-branch/Source/WebKit2/ChangeLog 2015-10-14 00:25:34 UTC (rev 191022)
+++ branches/safari-601.1.46.25-branch/Source/WebKit2/ChangeLog 2015-10-14 00:29:35 UTC (rev 191023)
@@ -1,3 +1,20 @@
+2015-10-13 Babak Shafiei <[email protected]>
+
+ Merge r191022.
+
+ 2015-10-13 Yongjun Zhang <[email protected]>
+
+ Use the correct notification strings for view service applications state change.
+ https://bugs.webkit.org/show_bug.cgi?id=150107
+
+ Use the correct notification names "_UIViewServiceHostDidEnterBackgroundNotification" and
+ "_UIViewServiceHostWillEnterForegroundNotification" to listen to view service application state changes.
+
+ Reviewed by Gavin Barraclough.
+
+ * UIProcess/ApplicationStateTracker.mm:
+ (WebKit::ApplicationStateTracker::ApplicationStateTracker):
+
2015-10-01 Babak Shafiei <[email protected]>
Merge r190418.
Modified: branches/safari-601.1.46.25-branch/Source/WebKit2/UIProcess/ApplicationStateTracker.mm (191022 => 191023)
--- branches/safari-601.1.46.25-branch/Source/WebKit2/UIProcess/ApplicationStateTracker.mm 2015-10-14 00:25:34 UTC (rev 191022)
+++ branches/safari-601.1.46.25-branch/Source/WebKit2/UIProcess/ApplicationStateTracker.mm 2015-10-14 00:29:35 UTC (rev 191023)
@@ -127,11 +127,10 @@
m_isInBackground = isBackgroundState([m_applicationStateMonitor mostElevatedApplicationStateForPID:applicationPID]);
NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
- m_didEnterBackgroundObserver = [notificationCenter addObserverForName:@"_UIViewServiceHostDidEnterBackgroundNotificationName" object:serviceViewController queue:nil usingBlock:[this](NSNotification *) {
+ m_didEnterBackgroundObserver = [notificationCenter addObserverForName:@"_UIViewServiceHostDidEnterBackgroundNotification" object:serviceViewController queue:nil usingBlock:[this](NSNotification *) {
applicationDidEnterBackground();
}];
-
- m_willEnterForegroundObserver = [notificationCenter addObserverForName:@"_UIViewServiceHostWillEnterForegroundNotificationName" object:serviceViewController queue:nil usingBlock:[this](NSNotification *) {
+ m_willEnterForegroundObserver = [notificationCenter addObserverForName:@"_UIViewServiceHostWillEnterForegroundNotification" object:serviceViewController queue:nil usingBlock:[this](NSNotification *) {
applicationWillEnterForeground();
}];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
