Title: [226891] branches/safari-605-branch
- Revision
- 226891
- Author
- [email protected]
- Date
- 2018-01-12 07:21:54 -0800 (Fri, 12 Jan 2018)
Log Message
Cherry-pick r226813. rdar://problem/36458922
Modified Paths
Diff
Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226890 => 226891)
--- branches/safari-605-branch/LayoutTests/ChangeLog 2018-01-12 15:21:51 UTC (rev 226890)
+++ branches/safari-605-branch/LayoutTests/ChangeLog 2018-01-12 15:21:54 UTC (rev 226891)
@@ -1,5 +1,21 @@
2018-01-12 Jason Marcell <[email protected]>
+ Cherry-pick r226813. rdar://problem/36458922
+
+ 2018-01-11 Chris Dumez <[email protected]>
+
+ ASSERTION FAILED: registration in WebCore::SWServerWorker::skipWaiting()
+ https://bugs.webkit.org/show_bug.cgi?id=181222
+ <rdar://problem/36332686>
+
+ Reviewed by Youenn Fablet.
+
+ Unskip test that is no longer flakily crashing.
+
+ * TestExpectations:
+
+2018-01-12 Jason Marcell <[email protected]>
+
Cherry-pick r226792. rdar://problem/36450742
2018-01-11 Youenn Fablet <[email protected]>
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (226890 => 226891)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-12 15:21:51 UTC (rev 226890)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-12 15:21:54 UTC (rev 226891)
@@ -1,3 +1,24 @@
+2018-01-12 Jason Marcell <[email protected]>
+
+ Cherry-pick r226813. rdar://problem/36458922
+
+ 2018-01-11 Chris Dumez <[email protected]>
+
+ ASSERTION FAILED: registration in WebCore::SWServerWorker::skipWaiting()
+ https://bugs.webkit.org/show_bug.cgi?id=181222
+ <rdar://problem/36332686>
+
+ Reviewed by Youenn Fablet.
+
+ Replace assertion in SWServerWorker::skipWaiting() that assumes the worker
+ has a registration. Nowadays, a SWServerWorker can stay alive for a short
+ period without having a registration, while it is terminating.
+
+ No new tests, unskipped existing test.
+
+ * workers/service/server/SWServerWorker.cpp:
+ (WebCore::SWServerWorker::skipWaiting):
+
2018-01-11 Jason Marcell <[email protected]>
Cherry-pick r226818. rdar://problem/36458899
Modified: branches/safari-605-branch/Source/WebCore/workers/service/server/SWServerWorker.cpp (226890 => 226891)
--- branches/safari-605-branch/Source/WebCore/workers/service/server/SWServerWorker.cpp 2018-01-12 15:21:51 UTC (rev 226890)
+++ branches/safari-605-branch/Source/WebCore/workers/service/server/SWServerWorker.cpp 2018-01-12 15:21:54 UTC (rev 226891)
@@ -133,8 +133,9 @@
m_isSkipWaitingFlagSet = true;
auto* registration = m_server.getRegistration(m_registrationKey);
- ASSERT(registration);
- registration->tryActivate();
+ ASSERT(registration || isTerminating());
+ if (registration)
+ registration->tryActivate();
}
void SWServerWorker::setHasPendingEvents(bool hasPendingEvents)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes