Title: [221509] trunk/Source/WebCore
Revision
221509
Author
beid...@apple.com
Date
2017-09-01 16:59:21 -0700 (Fri, 01 Sep 2017)

Log Message

ASSERTION FAILED: taken.get() == &job in WebCore::ServiceWorkerContainer::jobDidFinish(WebCore::ServiceWorkerJob &).
https://bugs.webkit.org/show_bug.cgi?id=176234

Rubberstamped by Tim Horton, reluctantly.

* workers/service/ServiceWorkerContainer.cpp:
(WebCore::ServiceWorkerContainer::jobDidFinish): It's valid for the job to be missing after navigations, which is
  why this was hitting downstream tests.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (221508 => 221509)


--- trunk/Source/WebCore/ChangeLog	2017-09-01 23:54:23 UTC (rev 221508)
+++ trunk/Source/WebCore/ChangeLog	2017-09-01 23:59:21 UTC (rev 221509)
@@ -1,3 +1,14 @@
+2017-09-01  Brady Eidson  <beid...@apple.com>
+
+        ASSERTION FAILED: taken.get() == &job in WebCore::ServiceWorkerContainer::jobDidFinish(WebCore::ServiceWorkerJob &).
+        https://bugs.webkit.org/show_bug.cgi?id=176234
+
+        Rubberstamped by Tim Horton, reluctantly.
+
+        * workers/service/ServiceWorkerContainer.cpp:
+        (WebCore::ServiceWorkerContainer::jobDidFinish): It's valid for the job to be missing after navigations, which is
+          why this was hitting downstream tests.
+
 2017-09-01  Youenn Fablet  <you...@apple.com>
 
         Do not Reject CacheStorage promises when updating the persistent filesystem data fails

Modified: trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp (221508 => 221509)


--- trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp	2017-09-01 23:54:23 UTC (rev 221508)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp	2017-09-01 23:59:21 UTC (rev 221509)
@@ -215,7 +215,7 @@
 void ServiceWorkerContainer::jobDidFinish(ServiceWorkerJob& job)
 {
     auto taken = m_jobMap.take(job.data().identifier());
-    ASSERT_UNUSED(taken, taken.get() == &job);
+    ASSERT_UNUSED(taken, !taken || taken.get() == &job);
 }
 
 uint64_t ServiceWorkerContainer::connectionIdentifier()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to