| 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 68eb5a3148ce2ac6081e99dee7e7af0439a80bf9..5ba351c11d1c0998a54f110a843f1390253a67d7 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 {
|
|
|
| @@ -34,10 +35,11 @@ WebPresentationClient* presentationClient(ExecutionContext* executionContext) {
|
| // static
|
| PresentationAvailability* PresentationAvailability::take(
|
| PresentationAvailabilityProperty* resolver,
|
| - const KURL& url,
|
| + const WTF::Vector<KURL>& urls,
|
| bool value) {
|
| PresentationAvailability* presentationAvailability =
|
| - new PresentationAvailability(resolver->getExecutionContext(), url, value);
|
| + new PresentationAvailability(resolver->getExecutionContext(), urls,
|
| + value);
|
| presentationAvailability->suspendIfNeeded();
|
| presentationAvailability->updateListening();
|
| return presentationAvailability;
|
| @@ -45,14 +47,19 @@ PresentationAvailability* PresentationAvailability::take(
|
|
|
| PresentationAvailability::PresentationAvailability(
|
| ExecutionContext* executionContext,
|
| - const KURL& url,
|
| + const WTF::Vector<KURL>& urls,
|
| bool value)
|
| : SuspendableObject(executionContext),
|
| PageVisibilityObserver(toDocument(executionContext)->page()),
|
| - m_url(url),
|
| + m_urls(urls),
|
| 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() {}
|
| @@ -122,8 +129,8 @@ void PresentationAvailability::updateListening() {
|
| client->stopListening(this);
|
| }
|
|
|
| -const WebURL PresentationAvailability::url() const {
|
| - return WebURL(m_url);
|
| +const WebVector<WebURL>& PresentationAvailability::urls() const {
|
| + return m_urls;
|
| }
|
|
|
| bool PresentationAvailability::value() const {
|
|
|