Title: [226064] trunk/Source/WebCore
- Revision
- 226064
- Author
- beid...@apple.com
- Date
- 2017-12-18 11:20:40 -0800 (Mon, 18 Dec 2017)
Log Message
REGRESSION: ASSERTION FAILED: !m_importCompleted
https://bugs.webkit.org/show_bug.cgi?id=180935
Unreviewed bot gardening.
No new tests (Covered by existing tests)
The ASSERT was invalid for database pushes failing to open databases like this, so skip it for that scenario.
* workers/service/server/RegistrationStore.cpp:
(WebCore::RegistrationStore::databaseFailedToOpen):
* workers/service/server/SWServer.cpp:
(WebCore::SWServer::registrationStoreDatabaseFailedToOpen):
* workers/service/server/SWServer.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (226063 => 226064)
--- trunk/Source/WebCore/ChangeLog 2017-12-18 18:54:36 UTC (rev 226063)
+++ trunk/Source/WebCore/ChangeLog 2017-12-18 19:20:40 UTC (rev 226064)
@@ -1,3 +1,20 @@
+2017-12-18 Brady Eidson <beid...@apple.com>
+
+ REGRESSION: ASSERTION FAILED: !m_importCompleted
+ https://bugs.webkit.org/show_bug.cgi?id=180935
+
+ Unreviewed bot gardening.
+
+ No new tests (Covered by existing tests)
+
+ The ASSERT was invalid for database pushes failing to open databases like this, so skip it for that scenario.
+
+ * workers/service/server/RegistrationStore.cpp:
+ (WebCore::RegistrationStore::databaseFailedToOpen):
+ * workers/service/server/SWServer.cpp:
+ (WebCore::SWServer::registrationStoreDatabaseFailedToOpen):
+ * workers/service/server/SWServer.h:
+
2017-12-18 Jer Noble <jer.no...@apple.com>
Playing media elements which call "pause(); play()" will have the play promise rejected.
Modified: trunk/Source/WebCore/workers/service/server/RegistrationStore.cpp (226063 => 226064)
--- trunk/Source/WebCore/workers/service/server/RegistrationStore.cpp 2017-12-18 18:54:36 UTC (rev 226063)
+++ trunk/Source/WebCore/workers/service/server/RegistrationStore.cpp 2017-12-18 19:20:40 UTC (rev 226064)
@@ -100,7 +100,7 @@
void RegistrationStore::databaseFailedToOpen()
{
- m_server.registrationStoreImportComplete();
+ m_server.registrationStoreDatabaseFailedToOpen();
}
void RegistrationStore::databaseOpenedAndRecordsImported()
Modified: trunk/Source/WebCore/workers/service/server/SWServer.cpp (226063 => 226064)
--- trunk/Source/WebCore/workers/service/server/SWServer.cpp 2017-12-18 18:54:36 UTC (rev 226063)
+++ trunk/Source/WebCore/workers/service/server/SWServer.cpp 2017-12-18 19:20:40 UTC (rev 226064)
@@ -114,6 +114,12 @@
performGetOriginsWithRegistrationsCallbacks();
}
+void SWServer::registrationStoreDatabaseFailedToOpen()
+{
+ if (!m_importCompleted)
+ registrationStoreImportComplete();
+}
+
void SWServer::addRegistrationFromStore(ServiceWorkerContextData&& data)
{
// Pages should not have been able to make a new registration to this key while the import was still taking place.
Modified: trunk/Source/WebCore/workers/service/server/SWServer.h (226063 => 226064)
--- trunk/Source/WebCore/workers/service/server/SWServer.h 2017-12-18 18:54:36 UTC (rev 226063)
+++ trunk/Source/WebCore/workers/service/server/SWServer.h 2017-12-18 19:20:40 UTC (rev 226064)
@@ -173,6 +173,7 @@
void addRegistrationFromStore(ServiceWorkerContextData&&);
void registrationStoreImportComplete();
+ void registrationStoreDatabaseFailedToOpen();
WEBCORE_EXPORT void getOriginsWithRegistrations(WTF::Function<void(const HashSet<SecurityOriginData>&)>);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
