Title: [224591] trunk/Source/WebCore
- Revision
- 224591
- Author
- [email protected]
- Date
- 2017-11-08 12:02:58 -0800 (Wed, 08 Nov 2017)
Log Message
Simplify ServiceWorkerContainer::jobResolvedWithRegistration()
https://bugs.webkit.org/show_bug.cgi?id=179429
Reviewed by Brady Eidson.
* workers/service/ServiceWorkerContainer.cpp:
(WebCore::ServiceWorkerContainer::jobResolvedWithRegistration):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (224590 => 224591)
--- trunk/Source/WebCore/ChangeLog 2017-11-08 20:02:24 UTC (rev 224590)
+++ trunk/Source/WebCore/ChangeLog 2017-11-08 20:02:58 UTC (rev 224591)
@@ -1,5 +1,15 @@
2017-11-08 Chris Dumez <[email protected]>
+ Simplify ServiceWorkerContainer::jobResolvedWithRegistration()
+ https://bugs.webkit.org/show_bug.cgi?id=179429
+
+ Reviewed by Brady Eidson.
+
+ * workers/service/ServiceWorkerContainer.cpp:
+ (WebCore::ServiceWorkerContainer::jobResolvedWithRegistration):
+
+2017-11-08 Chris Dumez <[email protected]>
+
[Service Workers] Make sure SWServerRegistration update functions always message back the connection that scheduled the job
https://bugs.webkit.org/show_bug.cgi?id=179428
Modified: trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp (224590 => 224591)
--- trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp 2017-11-08 20:02:24 UTC (rev 224590)
+++ trunk/Source/WebCore/workers/service/ServiceWorkerContainer.cpp 2017-11-08 20:02:58 UTC (rev 224591)
@@ -345,29 +345,19 @@
return;
}
- // FIXME: Implement proper selection of service workers.
- auto* installingServiceWorker = context->activeServiceWorker();
ASSERT(data.installingServiceWorkerIdentifier);
- if (!installingServiceWorker || installingServiceWorker->identifier() != *data.installingServiceWorkerIdentifier) {
- context->setActiveServiceWorker(ServiceWorker::create(*context, *data.installingServiceWorkerIdentifier, data.scriptURL));
- installingServiceWorker = context->activeServiceWorker();
- }
+ auto installingServiceWorkerIdentifier = *data.installingServiceWorkerIdentifier;
RefPtr<ServiceWorkerRegistration> registration = m_registrations.get(data.key);
- if (!registration) {
- // Currently the only registrations that can be created for the first time here should be Installing.
- ASSERT(data.installingServiceWorkerIdentifier);
- auto installingIdentifier = *data.installingServiceWorkerIdentifier;
-
+ if (!registration)
registration = ServiceWorkerRegistration::create(*context, *this, WTFMove(data));
- registration->updateStateFromServer(ServiceWorkerRegistrationState::Installing, installingIdentifier);
- ASSERT(registration->installing());
- installingServiceWorker = registration->installing();
- }
+ registration->updateStateFromServer(ServiceWorkerRegistrationState::Installing, installingServiceWorkerIdentifier);
+ ASSERT(registration->installing());
+ registration->installing()->updateWorkerState(ServiceWorkerState::Installing, ServiceWorker::DoNotFireStateChangeEvent);
- installingServiceWorker->updateWorkerState(ServiceWorkerState::Installing, ServiceWorker::DoNotFireStateChangeEvent);
- registration->setInstallingWorker(installingServiceWorker);
+ // FIXME: Implement proper selection of service workers.
+ context->setActiveServiceWorker(registration->installing());
LOG(ServiceWorker, "Container %p resolved job with registration %p", this, registration.get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
