Title: [234358] branches/safari-606-branch/Source/WebKit
Revision
234358
Author
[email protected]
Date
2018-07-29 23:33:00 -0700 (Sun, 29 Jul 2018)

Log Message

Cherry-pick r234349. rdar://problem/42721129

    [Wi-Fi Assertions] Pass a ResumptionReason to resumeWiFiAssertions
    https://bugs.webkit.org/show_bug.cgi?id=188142
    <rdar://problem/42628842>

    Reviewed by Darin Adler.

    * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
    (WebKit::NetworkProcess::platformProcessDidResume):
    (WebKit::NetworkProcess::platformProcessDidTransitionToForeground):

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

Modified Paths

Diff

Modified: branches/safari-606-branch/Source/WebKit/ChangeLog (234357 => 234358)


--- branches/safari-606-branch/Source/WebKit/ChangeLog	2018-07-30 06:28:26 UTC (rev 234357)
+++ branches/safari-606-branch/Source/WebKit/ChangeLog	2018-07-30 06:33:00 UTC (rev 234358)
@@ -1,5 +1,33 @@
 2018-07-29  Babak Shafiei  <[email protected]>
 
+        Cherry-pick r234349. rdar://problem/42721129
+
+    [Wi-Fi Assertions] Pass a ResumptionReason to resumeWiFiAssertions
+    https://bugs.webkit.org/show_bug.cgi?id=188142
+    <rdar://problem/42628842>
+    
+    Reviewed by Darin Adler.
+    
+    * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+    (WebKit::NetworkProcess::platformProcessDidResume):
+    (WebKit::NetworkProcess::platformProcessDidTransitionToForeground):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@234349 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-07-28  Andy Estes  <[email protected]>
+
+            [Wi-Fi Assertions] Pass a ResumptionReason to resumeWiFiAssertions
+            https://bugs.webkit.org/show_bug.cgi?id=188142
+            <rdar://problem/42628842>
+
+            Reviewed by Darin Adler.
+
+            * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+            (WebKit::NetworkProcess::platformProcessDidResume):
+            (WebKit::NetworkProcess::platformProcessDidTransitionToForeground):
+
+2018-07-29  Babak Shafiei  <[email protected]>
+
         Cherry-pick r234330. rdar://problem/42721217
 
     Be more conservative with compositing layer creation when memory is low

Modified: branches/safari-606-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (234357 => 234358)


--- branches/safari-606-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2018-07-30 06:28:26 UTC (rev 234357)
+++ branches/safari-606-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	2018-07-30 06:33:00 UTC (rev 234358)
@@ -221,7 +221,7 @@
 void NetworkProcess::platformProcessDidResume()
 {
 #if ENABLE(WIFI_ASSERTIONS)
-    resumeWiFiAssertions();
+    resumeWiFiAssertions(ResumptionReason::ProcessResuming);
 #endif
 }
 
@@ -235,7 +235,7 @@
 void NetworkProcess::platformProcessDidTransitionToForeground()
 {
 #if ENABLE(WIFI_ASSERTIONS)
-    resumeWiFiAssertions();
+    resumeWiFiAssertions(ResumptionReason::ProcessForegrounding);
 #endif
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to