Add origins argument to registerForeignFetchScopes.

third_party/WebKit/Source/modules/serviceworkers/InstallEvent.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/serviceworkers/InstallEvent.h"
 
+#include "bindings/modules/v8/UnionTypesModules.h"
 #include "core/dom/ExceptionCode.h"
 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
 
 namespace blink {
 
 PassRefPtrWillBeRawPtr<InstallEvent> InstallEvent::create()
 {
     return adoptRefWillBeNoop(new InstallEvent());
 }
 
 PassRefPtrWillBeRawPtr<InstallEvent> InstallEvent::create(const AtomicString& type, const ExtendableEventInit& eventInit)
 {
     return adoptRefWillBeNoop(new InstallEvent(type, eventInit));
 }
 
 PassRefPtrWillBeRawPtr<InstallEvent> InstallEvent::create(const AtomicString& type, const ExtendableEventInit& eventInit, WaitUntilObserver* observer)
 {
     return adoptRefWillBeNoop(new InstallEvent(type, eventInit, observer));
 }
 
 InstallEvent::~InstallEvent()
 {
 }
 
-void InstallEvent::registerForeignFetchScopes(ExecutionContext* executionContext, const Vector<String>& subScopes, ExceptionState& exceptionState)
+void InstallEvent::registerForeignFetchScopes(ExecutionContext* executionContext, const Vector<String>& subScopes, const USVStringOrUSVStringSequence& origins, ExceptionState& exceptionState)
 {
     if (!isBeingDispatched()) {
         exceptionState.throwDOMException(InvalidStateError, "The event handler is already finished.");
         return;
     }
 
+    Vector<String> originList;
+    if (origins.isUSVString()) {
+        originList.append(origins.getAsUSVString());
+    } else if (origins.isUSVStringSequence()) {
+        originList = origins.getAsUSVStringSequence();
+    }
+    if (originList.isEmpty()) {
+        exceptionState.throwTypeError("At least one origin is required");
+        return;
+    }

[falken, 2016/02/03 02:17:32]

I'm not sure but would ['*'] and '*' arguments have the same effect? The spec
seems to treat them differently.

[Marijn Kruisselbrink, 2016/02/03 17:53:31]

Hmm, yeah. I think I would prefer to treat those the same. I added a comment to
the spec pull request to figure out how to properly specify whatever the desired
behavior is and will reconcile the implementation if that turns out to be
needed.

+
+    Vector<KURL> originURLs;
+    if (originList.size() != 1 || originList[0] != "*") {

[falken, 2016/02/03 02:17:32]

The '*' special case and how it translates to the empty list is somewhat
non-obvious. Would it be worth copy/pasting the spec as a comment?

[Marijn Kruisselbrink, 2016/02/03 17:53:31]

I added a comment to try to explain this.

+        originURLs.resize(originList.size());
+        for (size_t i = 0; i < originList.size(); ++i) {
+            originURLs[i] = KURL(KURL(), originList[i]);
+            if (!originURLs[i].isValid()) {
+                exceptionState.throwTypeError("Invalid Origin URL: " + originList[i]);

[falken, 2016/02/03 02:17:32]

nit: should be consistent about origin vs Origin in the erorr messages.

[Marijn Kruisselbrink, 2016/02/03 17:53:31]

Done

+                return;
+            }
+        }
+    }
+
     ServiceWorkerGlobalScopeClient* client = ServiceWorkerGlobalScopeClient::from(executionContext);
 
     String scopePath = static_cast<KURL>(client->scope()).path();
     RefPtr<SecurityOrigin> origin = executionContext->securityOrigin();
 
     Vector<KURL> subScopeURLs(subScopes.size());
     for (size_t i = 0; i < subScopes.size(); ++i) {
         subScopeURLs[i] = executionContext->completeURL(subScopes[i]);
         if (!subScopeURLs[i].isValid()) {
             exceptionState.throwTypeError("Invalid URL: " + subScopes[i]);

[falken, 2016/02/03 02:17:32]

nit: here too maybe it should say "Invalid subscope URL"

[Marijn Kruisselbrink, 2016/02/03 17:53:30]

Done

             return;
         }
         subScopeURLs[i].removeFragmentIdentifier();
         if (!origin->canRequest(subScopeURLs[i])) {
             exceptionState.throwTypeError("URL is not within scope: " + subScopes[i]);
             return;
         }
         String subScopePath = subScopeURLs[i].path();
         if (!subScopePath.startsWith(scopePath)) {
             exceptionState.throwTypeError("URL is not within scope: " + subScopes[i]);
             return;
         }
     }
-    client->registerForeignFetchScopes(subScopeURLs);
+    client->registerForeignFetchScopes(subScopeURLs, originURLs);
 }
 
 const AtomicString& InstallEvent::interfaceName() const
 {
     return EventNames::InstallEvent;
 }
 
 InstallEvent::InstallEvent()
 {
 }
 
 InstallEvent::InstallEvent(const AtomicString& type, const ExtendableEventInit& initializer)
     : ExtendableEvent(type, initializer)
 {
 }
 
 InstallEvent::InstallEvent(const AtomicString& type, const ExtendableEventInit& initializer, WaitUntilObserver* observer)
     : ExtendableEvent(type, initializer, observer)
 {
 }
 
 } // namespace blink