Title: [285303] branches/safari-612-branch/Source/WebKit
Revision
285303
Author
[email protected]
Date
2021-11-04 12:56:29 -0700 (Thu, 04 Nov 2021)

Log Message

Cherry-pick r282849. rdar://problem/83067708

    Follow-up: WebKit::WebProcessPool should use a weak observer with CFNotificationCenter
    <https://webkit.org/b/230227>
    <rdar://problem/83067708>

    Reviewed by Tim Horton.

    * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
    (WebKit::WebProcessPool::registerNotificationObservers):
    - Set m_weakObserver for all platforms at the beginning of the
      method.  Previously it was only set for macOS.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282849 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (285302 => 285303)


--- branches/safari-612-branch/Source/WebKit/ChangeLog	2021-11-04 19:56:26 UTC (rev 285302)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog	2021-11-04 19:56:29 UTC (rev 285303)
@@ -1,5 +1,35 @@
 2021-11-04  Russell Epstein  <[email protected]>
 
+        Cherry-pick r282849. rdar://problem/83067708
+
+    Follow-up: WebKit::WebProcessPool should use a weak observer with CFNotificationCenter
+    <https://webkit.org/b/230227>
+    <rdar://problem/83067708>
+    
+    Reviewed by Tim Horton.
+    
+    * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+    (WebKit::WebProcessPool::registerNotificationObservers):
+    - Set m_weakObserver for all platforms at the beginning of the
+      method.  Previously it was only set for macOS.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@282849 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-09-21  David Kilzer  <[email protected]>
+
+            Follow-up: WebKit::WebProcessPool should use a weak observer with CFNotificationCenter
+            <https://webkit.org/b/230227>
+            <rdar://problem/83067708>
+
+            Reviewed by Tim Horton.
+
+            * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+            (WebKit::WebProcessPool::registerNotificationObservers):
+            - Set m_weakObserver for all platforms at the beginning of the
+              method.  Previously it was only set for macOS.
+
+2021-11-04  Russell Epstein  <[email protected]>
+
         Cherry-pick r285165. rdar://problem/84908023
 
     Revert the wheel event coalescing added in r277587

Modified: branches/safari-612-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (285302 => 285303)


--- branches/safari-612-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2021-11-04 19:56:26 UTC (rev 285302)
+++ branches/safari-612-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm	2021-11-04 19:56:29 UTC (rev 285303)
@@ -720,6 +720,8 @@
 
 void WebProcessPool::registerNotificationObservers()
 {
+    m_weakObserver = adoptNS([[WKProcessPoolWeakObserver alloc] initWithWeakPtr:makeWeakPtr(*this)]);
+
 #if !PLATFORM(IOS_FAMILY)
     m_powerObserver = makeUnique<WebCore::PowerObserver>([weakThis = makeWeakPtr(this)] {
         if (weakThis)
@@ -777,8 +779,6 @@
         setApplicationIsActive(false);
     }];
     
-    m_weakObserver = adoptNS([[WKProcessPoolWeakObserver alloc] initWithWeakPtr:makeWeakPtr(*this)]);
-
     addCFNotificationObserver(colorPreferencesDidChangeCallback, AppleColorPreferencesChangedNotification, CFNotificationCenterGetDistributedCenter());
 #elif !PLATFORM(MACCATALYST)
     addCFNotificationObserver(backlightLevelDidChangeCallback, (__bridge CFStringRef)UIBacklightLevelChangedNotification);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to