Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: Source/modules/serviceworkers/ServiceWorkerContainer.cpp

Issue 912443002: ServiceWorker: Make "ready" fetches registration from browser process(3/3). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: add cleanup Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/serviceworkers/ServiceWorkerContainer.cpp
diff --git a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
index b61dbda521a09236af6784426e14110a765a9bd3..3116ce086645d1ef5db8e56af8ff32324ca885e6 100644
--- a/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
+++ b/Source/modules/serviceworkers/ServiceWorkerContainer.cpp
@@ -119,7 +119,6 @@ void ServiceWorkerContainer::willBeDetachedFromFrame()
DEFINE_TRACE(ServiceWorkerContainer)
{
visitor->trace(m_controller);
- visitor->trace(m_readyRegistration);
visitor->trace(m_ready);
RefCountedGarbageCollectedEventTargetWithInlineData<ServiceWorkerContainer>::trace(visitor);
ContextLifecycleObserver::trace(visitor);
@@ -279,27 +278,6 @@ void ServiceWorkerContainer::setController(WebServiceWorker* serviceWorker, bool
dispatchEvent(Event::create(EventTypeNames::controllerchange));
}
-// FIXME: Remove this after Chrome side CL landed.
-void ServiceWorkerContainer::setReadyRegistration(WebServiceWorkerRegistration* registration)
-{
- if (!executionContext()) {
- ServiceWorkerRegistration::dispose(registration);
- return;
- }
-
- ServiceWorkerRegistration* readyRegistration = ServiceWorkerRegistration::from(executionContext(), registration);
- ASSERT(readyRegistration->active());
-
- if (m_readyRegistration) {
- ASSERT(m_readyRegistration == readyRegistration);
- ASSERT(m_ready->state() == ReadyProperty::Resolved);
- return;
- }
-
- m_readyRegistration = readyRegistration;
- m_ready->resolve(readyRegistration);
-}
-
void ServiceWorkerContainer::dispatchMessageEvent(const WebString& message, const WebMessagePortChannelArray& webChannels)
{
if (!executionContext() || !executionContext()->executingWindow())
@@ -342,9 +320,6 @@ ServiceWorkerContainer::ServiceWorkerContainer(ExecutionContext* executionContex
if (!executionContext)
return;
- // FIXME: Remove this after Chrome side CL landed.
- m_ready = createReadyProperty();
-
if (ServiceWorkerContainerClient* client = ServiceWorkerContainerClient::from(executionContext)) {
m_provider = client->provider();
if (m_provider)
« no previous file with comments | « Source/modules/serviceworkers/ServiceWorkerContainer.h ('k') | public/platform/WebServiceWorkerProviderClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698