X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=Source%2FWebKit%2FChangeLog;h=b0c78392524e10a903328dcef9b2f7d3c265ff4b;hp=1edaa625f3c6ce77d66c2e44108721c0f465ff7f;hb=323ba0d8ee9f6144da45e621c8dd119e43f1dded;hpb=d609f10c7f065fed5035ca958defdfc46816e7b8

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 1edaa62..b0c7839 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,5 +1,18 @@
 2018-06-03  Andy Estes  <aestes@apple.com>
 
+        [Wi-Fi Assertions] Resume assertions when NetworkProcess::cancelPrepareToSuspend is called
+        https://bugs.webkit.org/show_bug.cgi?id=186247
+
+        Reviewed by Tim Horton.
+
+        Since we suspended assertions in prepareToSuspend, we need to resume them if
+        cancelPrepareToSuspend is called.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::cancelPrepareToSuspend):
+
+2018-06-03  Andy Estes  <aestes@apple.com>
+
         [iOS] Add a needed networking process entitlement
         https://bugs.webkit.org/show_bug.cgi?id=186246
         <rdar://problem/39578861>