Rename WebServiceWorkerRegistry to WebServiceWorkerProvider

Source/modules/serviceworkers/NavigatorServiceWorker.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #include "V8ServiceWorker.h"
 #include "bindings/v8/ScriptPromiseResolver.h"
 #include "core/dom/Document.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/page/Frame.h"
 #include "core/page/Navigator.h"
 #include "core/workers/SharedWorker.h"
 #include "modules/serviceworkers/CallbackPromiseAdapter.h"
 #include "modules/serviceworkers/ServiceWorker.h"
-#include "public/platform/WebServiceWorkerRegistry.h"
+#include "public/platform/WebServiceWorkerProvider.h"
+#include "public/platform/WebServiceWorkerProviderClient.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 
+using WebKit::WebServiceWorkerProvider;
+using WebKit::WebString;
+
 namespace WebCore {
 
 NavigatorServiceWorker::NavigatorServiceWorker(Navigator* navigator)
     : m_navigator(navigator)
 {
 }
 
 NavigatorServiceWorker::~NavigatorServiceWorker()
 {
 }
 
 const char* NavigatorServiceWorker::supplementName()
 {
     return "NavigatorServiceWorker";
 }
 
+WebServiceWorkerProvider* NavigatorServiceWorker::serviceWorkerProvider()
+{
+    if (!m_provider) {
+        FrameLoaderClient* client = m_navigator->frame()->loader()->client();

[abarth-chromium, 2013/10/10 03:44:02]

m_navigator->frame() can be null.  What should we do in that case?

[alecflett, 2013/10/10 23:03:36]

Done.

+        // FIXME: This is temporarily hooked up here until we hook up to the loading process.
+        m_provider = adoptPtr(client->createServiceWorkerProvider(0));

[abarth-chromium, 2013/10/10 03:44:02]

We shouldn't be calling adoptPtr here.  Isntead, we should call adoptPtr
immediately after receiving the value over the API.  The rest of the functions
should work in terms of PassOwnPtr and OwnPtr.

[alecflett, 2013/10/10 23:03:36]

Done.

+    }
+    return m_provider.get();
+}
+
 NavigatorServiceWorker* NavigatorServiceWorker::from(Navigator* navigator)
 {
     NavigatorServiceWorker* supplement = toNavigatorServiceWorker(navigator);
     if (!supplement) {
         supplement = new NavigatorServiceWorker(navigator);
         provideTo(navigator, supplementName(), adoptPtr(supplement));
     }
     return supplement;
 }
 
 ScriptPromise NavigatorServiceWorker::registerServiceWorker(ScriptExecutionContext* context, Navigator* navigator, const String& pattern, const String& url, ExceptionState& es)
 {
     return from(navigator)->registerServiceWorker(context, pattern, url, es);
 }
 
-
 ScriptPromise NavigatorServiceWorker::registerServiceWorker(ScriptExecutionContext* scriptExecutionContext, const String& pattern, const String& scriptSrc, ExceptionState& es)
 {
     ASSERT(RuntimeEnabledFeatures::serviceWorkerEnabled());
-    FrameLoaderClient* client = m_navigator->frame()->loader()->client();
     // WTF? Surely there's a better way to resolve a url?
     KURL scriptUrl = m_navigator->frame()->document()->completeURL(scriptSrc);
-    WebKit::WebServiceWorkerRegistry* peer = client->serviceWorkerRegistry();
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptExecutionContext);
 
-    if (peer)
-        peer->registerServiceWorker(pattern, scriptUrl, new CallbackPromiseAdapter(resolver, scriptExecutionContext));
+    WebKit::WebServiceWorkerProvider* provider = serviceWorkerProvider();
+    if (provider)
+        provider->registerServiceWorker(scriptExecutionContext->url(), pattern, scriptUrl, new CallbackPromiseAdapter(resolver, scriptExecutionContext));

[abarth-chromium, 2013/10/10 03:44:02]

Why are you passing in the scriptExecutionContext->url() here instead of the
m_navigator->frame()->document()->url() ?  What do you do if
|scriptExecutionContext| and m_navigator->frame()->document() aren't the same
object?  Also, you're not handling the case where m_navigator->frame() is null.

     else
         resolver->reject(PassRefPtr<ServiceWorker>(0));
     // call here?
     return resolver->promise();
 }
 
 ScriptPromise NavigatorServiceWorker::unregisterServiceWorker(ScriptExecutionContext* context, Navigator* navigator, const String& pattern, ExceptionState& es)
 {
     return from(navigator)->unregisterServiceWorker(context, pattern, es);
 }
 
 ScriptPromise NavigatorServiceWorker::unregisterServiceWorker(ScriptExecutionContext* scriptExecutionContext, const String& pattern, ExceptionState& es)
 {
     ASSERT(RuntimeEnabledFeatures::serviceWorkerEnabled());
     FrameLoaderClient* client = m_navigator->frame()->loader()->client();
-    WebKit::WebServiceWorkerRegistry* peer = client->serviceWorkerRegistry();
+    WebKit::WebServiceWorkerProvider* provider = serviceWorkerProvider();
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptExecutionContext);
-    if (peer)
-        peer->unregisterServiceWorker(pattern, new CallbackPromiseAdapter(resolver, scriptExecutionContext));
+    if (provider)
+        provider->unregisterServiceWorker(scriptExecutionContext->url(), pattern, new CallbackPromiseAdapter(resolver, scriptExecutionContext));

[abarth-chromium, 2013/10/10 03:44:02]

Again, why are you using the |scriptExecutionContext| for the context instead of
m_navigator->frame()->document() ?

     else
         resolver->reject(PassRefPtr<ServiceWorker>(0));
     return resolver->promise();
 }
 
 } // namespace WebCore