Title: [225976] trunk/Source/WebCore
- Revision
- 225976
- Author
- cdu...@apple.com
- Date
- 2017-12-15 11:57:02 -0800 (Fri, 15 Dec 2017)
Log Message
imported/w3c/web-platform-tests/service-workers/service-worker/update.https.html is sometimes crashing in Debug builds
https://bugs.webkit.org/show_bug.cgi?id=180867
Reviewed by Brady Eidson.
Fix assertion to make sure the worker is terminating if it is already in m_runningOrTerminatingWorkers.
* workers/service/server/SWServer.cpp:
(WebCore::SWServer::runServiceWorker):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (225975 => 225976)
--- trunk/Source/WebCore/ChangeLog 2017-12-15 19:36:51 UTC (rev 225975)
+++ trunk/Source/WebCore/ChangeLog 2017-12-15 19:57:02 UTC (rev 225976)
@@ -1,5 +1,17 @@
2017-12-15 Chris Dumez <cdu...@apple.com>
+ imported/w3c/web-platform-tests/service-workers/service-worker/update.https.html is sometimes crashing in Debug builds
+ https://bugs.webkit.org/show_bug.cgi?id=180867
+
+ Reviewed by Brady Eidson.
+
+ Fix assertion to make sure the worker is terminating if it is already in m_runningOrTerminatingWorkers.
+
+ * workers/service/server/SWServer.cpp:
+ (WebCore::SWServer::runServiceWorker):
+
+2017-12-15 Chris Dumez <cdu...@apple.com>
+
Service Worker Registration promise is sometimes not rejected when the script load fails
https://bugs.webkit.org/show_bug.cgi?id=180849
Modified: trunk/Source/WebCore/workers/service/server/SWServer.cpp (225975 => 225976)
--- trunk/Source/WebCore/workers/service/server/SWServer.cpp 2017-12-15 19:36:51 UTC (rev 225975)
+++ trunk/Source/WebCore/workers/service/server/SWServer.cpp 2017-12-15 19:57:02 UTC (rev 225976)
@@ -518,7 +518,7 @@
return false;
auto addResult = m_runningOrTerminatingWorkers.add(identifier, *worker);
- ASSERT_UNUSED(addResult, addResult.isNewEntry);
+ ASSERT_UNUSED(addResult, addResult.isNewEntry || worker->isTerminating());
worker->setState(SWServerWorker::State::Running);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
