[Presentation API] Add support to content/ for multiple URLs per PresentationRequest.

third_party/WebKit/Source/modules/presentation/PresentationRequest.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/presentation/PresentationRequest.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 87 matching lines @@
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidAccessError, "PresentationRequest::start() requires user gesture."));
 
     if (toDocument(getExecutionContext())->isSandboxed(SandboxPresentation))
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(SecurityError, "The document is sandboxed and lacks the 'allow-presentation' flag."));
 
     WebPresentationClient* client = presentationClient(getExecutionContext());
     if (!client)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "The PresentationRequest is no longer associated to a frame."));
 
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
-    client->startSession(m_url.getString(), new PresentationConnectionCallbacks(resolver, this));
+    // TODO(crbug.com/627655): Accept multiple URLs per PresentationRequest.
+    WebVector<WebString> presentationUrls(static_cast<size_t>(1));

[dcheng, 2016/08/30 05:47:31]

presentationUrl(1U) here and below

[mark a. foltz, 2016/08/30 19:57:54]

Done.

+    presentationUrls[0] = m_url.getString();
+    client->startSession(presentationUrls, new PresentationConnectionCallbacks(resolver, this));
     return resolver->promise();
 }
 
 ScriptPromise PresentationRequest::reconnect(ScriptState* scriptState, const String& id)
 {
     if (toDocument(getExecutionContext())->isSandboxed(SandboxPresentation))
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(SecurityError, "The document is sandboxed and lacks the 'allow-presentation' flag."));
 
     WebPresentationClient* client = presentationClient(getExecutionContext());
     if (!client)
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, "The PresentationRequest is no longer associated to a frame."));
 
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
-    client->joinSession(m_url.getString(), id, new PresentationConnectionCallbacks(resolver, this));
+    // TODO(crbug.com/627655): Accept multiple URLs per PresentationRequest.
+    WebVector<WebString> presentationUrls(static_cast<size_t>(1));
+    presentationUrls[0] = m_url.getString();
+    client->joinSession(presentationUrls, id, new PresentationConnectionCallbacks(resolver, this));
     return resolver->promise();
 }
 
 ScriptPromise PresentationRequest::getAvailability(ScriptState* scriptState)
 {
     if (toDocument(getExecutionContext())->isSandboxed(SandboxPresentation))
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(SecurityError, "The document is sandboxed and lacks the 'allow-presentation' flag."));
 
     WebPresentationClient* client = presentationClient(getExecutionContext());
     if (!client)
@@ skipping 16 matching lines @@
 }
 
 PresentationRequest::PresentationRequest(ExecutionContext* executionContext, const KURL& url)
     : ActiveScriptWrappable(this)
     , ActiveDOMObject(executionContext)
     , m_url(url)
 {
 }
 
 } // namespace blink