| Index: third_party/WebKit/Source/modules/mediasession/MediaMetadata.cpp
|
| diff --git a/third_party/WebKit/Source/modules/mediasession/MediaMetadata.cpp b/third_party/WebKit/Source/modules/mediasession/MediaMetadata.cpp
|
| index 438764db1a5f7f40116e94eef11ee1412624491d..9400763bd771f8e98931274d86e79e0e1a8e5658 100644
|
| --- a/third_party/WebKit/Source/modules/mediasession/MediaMetadata.cpp
|
| +++ b/third_party/WebKit/Source/modules/mediasession/MediaMetadata.cpp
|
| @@ -4,22 +4,33 @@
|
|
|
| #include "modules/mediasession/MediaMetadata.h"
|
|
|
| +#include "core/dom/ExecutionContext.h"
|
| +#include "modules/mediasession/MediaArtwork.h"
|
| #include "modules/mediasession/MediaMetadataInit.h"
|
| -#include "wtf/text/WTFString.h"
|
|
|
| namespace blink {
|
|
|
| // static
|
| -MediaMetadata* MediaMetadata::create(const MediaMetadataInit& metadata)
|
| +MediaMetadata* MediaMetadata::create(ExecutionContext* context, const MediaMetadataInit& metadata)
|
| {
|
| - return new MediaMetadata(metadata);
|
| + return new MediaMetadata(context, metadata);
|
| }
|
|
|
| -MediaMetadata::MediaMetadata(const MediaMetadataInit& metadata)
|
| +MediaMetadata::MediaMetadata(ExecutionContext* context, const MediaMetadataInit& metadata)
|
| {
|
| m_data.title = metadata.title();
|
| m_data.artist = metadata.artist();
|
| m_data.album = metadata.album();
|
| + if (metadata.hasArtworks()) {
|
| + WebVector<WebMediaArtwork> webArtworks(metadata.artworks().size());
|
| + for (size_t i = 0; i < metadata.artworks().size(); ++i) {
|
| + const MediaArtworkInit& metaArtwork = metadata.artworks()[i];
|
| + MediaArtwork* artwork = MediaArtwork::create(context, metaArtwork);
|
| + m_artworks.append(artwork);
|
| + webArtworks[i] = *artwork->data();
|
| + m_data.artworks.swap(webArtworks);
|
| + }
|
| + }
|
| }
|
|
|
| String MediaMetadata::title() const
|
| @@ -37,4 +48,9 @@ String MediaMetadata::album() const
|
| return m_data.album;
|
| }
|
|
|
| +HeapVector<Member<MediaArtwork>> MediaMetadata::artworks() const
|
| +{
|
| + return m_artworks;
|
| +}
|
| +
|
| } // namespace blink
|
|
|