| Index: third_party/WebKit/Source/modules/presentation/PresentationAvailability.cpp
|
| diff --git a/third_party/WebKit/Source/modules/presentation/PresentationAvailability.cpp b/third_party/WebKit/Source/modules/presentation/PresentationAvailability.cpp
|
| index 07f62d09e25dbb2f4f04d22bc05b4cd1c9e24ca8..74fdaebbb115fb211287d5772cfa41057e0c58b2 100644
|
| --- a/third_party/WebKit/Source/modules/presentation/PresentationAvailability.cpp
|
| +++ b/third_party/WebKit/Source/modules/presentation/PresentationAvailability.cpp
|
| @@ -12,6 +12,7 @@
|
| #include "modules/presentation/PresentationController.h"
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/modules/presentation/WebPresentationClient.h"
|
| +#include "wtf/Vector.h"
|
|
|
| namespace blink {
|
|
|
| @@ -31,23 +32,27 @@ WebPresentationClient* presentationClient(ExecutionContext* executionContext)
|
| } // anonymous namespace
|
|
|
| // static
|
| -PresentationAvailability* PresentationAvailability::take(ScriptPromiseResolver* resolver, const KURL& url, bool value)
|
| +PresentationAvailability* PresentationAvailability::take(ScriptPromiseResolver* resolver, const WTF::Vector<KURL>& urls, bool value)
|
| {
|
| - PresentationAvailability* presentationAvailability = new PresentationAvailability(resolver->getExecutionContext(), url, value);
|
| + PresentationAvailability* presentationAvailability = new PresentationAvailability(resolver->getExecutionContext(), urls, value);
|
| presentationAvailability->suspendIfNeeded();
|
| presentationAvailability->updateListening();
|
| return presentationAvailability;
|
| }
|
|
|
| -PresentationAvailability::PresentationAvailability(ExecutionContext* executionContext, const KURL& url, bool value)
|
| +PresentationAvailability::PresentationAvailability(ExecutionContext* executionContext, const WTF::Vector<KURL>& urls, bool value)
|
| : ActiveScriptWrappable(this)
|
| , ActiveDOMObject(executionContext)
|
| , PageVisibilityObserver(toDocument(executionContext)->page())
|
| - , m_url(url)
|
| , m_value(value)
|
| , m_state(State::Active)
|
| {
|
| ASSERT(executionContext->isDocument());
|
| + WebVector<WebURL> data(urls.size());
|
| + for (size_t i = 0; i < urls.size(); ++i)
|
| + data[i] = WebURL(urls[i]);
|
| +
|
| + m_urls.swap(data);
|
| }
|
|
|
| PresentationAvailability::~PresentationAvailability()
|
| @@ -125,9 +130,9 @@ void PresentationAvailability::updateListening()
|
| client->stopListening(this);
|
| }
|
|
|
| -const WebURL PresentationAvailability::url() const
|
| +const WebVector<WebURL>& PresentationAvailability::urls() const
|
| {
|
| - return WebURL(m_url);
|
| + return m_urls;
|
| }
|
|
|
| bool PresentationAvailability::value() const
|
|
|