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 16 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "config.h"
 #include "modules/serviceworkers/NavigatorServiceWorker.h"
 
 #include "RuntimeEnabledFeatures.h"
 #include "V8ServiceWorker.h"
 #include "bindings/v8/ScriptPromiseResolver.h"
 #include "core/dom/Document.h"
+#include "core/dom/ExceptionCode.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)
+    : DOMWindowProperty(navigator->frame())

[abarth-chromium, 2013/10/11 19:02:41]

Yeah, that's fine.

+    , m_navigator(navigator)
 {
 }
 
 NavigatorServiceWorker::~NavigatorServiceWorker()
 {
 }
 
 const char* NavigatorServiceWorker::supplementName()
 {
     return "NavigatorServiceWorker";
 }
 
+WebServiceWorkerProvider* NavigatorServiceWorker::ensureProvider()
+{
+    if (!m_provider) {
+        Frame* frame = m_navigator->frame();
+        ASSERT(frame);

[abarth-chromium, 2013/10/11 19:02:41]

I would move this ASSERT above the "if (!m_provider)" line so that you get more
coverage from it.  It's an invariant of this function that it must be called
while we're still connected with the frame, regardless of whether we're already
created the provider.

+
+        FrameLoaderClient* client = frame->loader()->client();
+        // FIXME: This is temporarily hooked up here until we hook up to the loading process.
+        m_provider = client->createServiceWorkerProvider(nullptr);
+    }
+    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();
+    Frame* frame = m_navigator->frame();
+
+    if (!frame) {
+        es.throwDOMException(InvalidStateError, "No document available.");
+        return ScriptPromise();
+    }
+
+    RefPtr<SecurityOrigin> documentOrigin = frame->document()->securityOrigin();
+
+    KURL patternUrl = scriptExecutionContext->completeURL(pattern);

[abarth-chromium, 2013/10/11 19:02:41]

patternUrl -> patternURL

+    if (documentOrigin->canRequest(patternUrl)) {
+        es.throwSecurityError("Can only register for patterns in the document's origin.");
+        return ScriptPromise();
+    }
+
+    KURL scriptUrl = scriptExecutionContext->completeURL(scriptSrc);

[abarth-chromium, 2013/10/11 19:02:41]

scriptUrl -> scriptURL

(Notice, for example, that completeURL has URL in all caps.)

+    if (documentOrigin->canRequest(scriptUrl)) {
+        es.throwSecurityError("Script must be in document's origin.");
+        return ScriptPromise();
+    }
+
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptExecutionContext);
-
-    if (peer)
-        peer->registerServiceWorker(pattern, scriptUrl, new CallbackPromiseAdapter(resolver, scriptExecutionContext));
-    else
-        resolver->reject(PassRefPtr<ServiceWorker>(0));
-    // call here?
+    ensureProvider()->registerServiceWorker(patternUrl, scriptUrl, new CallbackPromiseAdapter(resolver, scriptExecutionContext));
     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();
+    Frame* frame = m_navigator->frame();
+    if (!frame) {
+        es.throwDOMException(InvalidStateError, "No document available.");
+        return ScriptPromise();
+    }
+
+    RefPtr<SecurityOrigin> documentOrigin = frame->document()->securityOrigin();
+
+    KURL patternUrl = scriptExecutionContext->completeURL(pattern);
+    if (documentOrigin->canRequest(patternUrl)) {
+        es.throwSecurityError("Can only unregister for patterns in the document's origin.");
+        return ScriptPromise();
+    }
+
     RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptExecutionContext);
-    if (peer)
-        peer->unregisterServiceWorker(pattern, new CallbackPromiseAdapter(resolver, scriptExecutionContext));
-    else
-        resolver->reject(PassRefPtr<ServiceWorker>(0));
+    ensureProvider()->unregisterServiceWorker(patternUrl, new CallbackPromiseAdapter(resolver, scriptExecutionContext));
     return resolver->promise();
 }
 
+void NavigatorServiceWorker::willDetachGlobalObjectFromFrame()
+{
+    m_provider = nullptr;
+    DOMWindowProperty::willDetachGlobalObjectFromFrame();
+}
+
+
 } // namespace WebCore