Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "modules/mediasession/MediaMetadata.h" | 5 #include "modules/mediasession/MediaMetadata.h" |
| 6 | 6 |
| 7 #include "core/dom/ExecutionContext.h" | |
| 8 #include "modules/mediasession/MediaArtwork.h" | |
| 7 #include "modules/mediasession/MediaMetadataInit.h" | 9 #include "modules/mediasession/MediaMetadataInit.h" |
| 8 #include "wtf/text/WTFString.h" | |
| 9 | 10 |
| 10 namespace blink { | 11 namespace blink { |
| 11 | 12 |
| 12 // static | 13 // static |
| 13 MediaMetadata* MediaMetadata::create(const MediaMetadataInit& metadata) | 14 MediaMetadata* MediaMetadata::create(ExecutionContext* context, const MediaMetad ataInit& metadata) |
| 14 { | 15 { |
| 15 return new MediaMetadata(metadata); | 16 return new MediaMetadata(context, metadata); |
| 16 } | 17 } |
| 17 | 18 |
| 18 MediaMetadata::MediaMetadata(const MediaMetadataInit& metadata) | 19 MediaMetadata::MediaMetadata(ExecutionContext* context, const MediaMetadataInit& metadata) |
| 19 { | 20 { |
| 20 m_data.title = metadata.title(); | 21 m_data.title = metadata.title(); |
| 21 m_data.artist = metadata.artist(); | 22 m_data.artist = metadata.artist(); |
| 22 m_data.album = metadata.album(); | 23 m_data.album = metadata.album(); |
| 24 if (metadata.hasArtworks()) { | |
| 25 WebVector<WebMediaArtwork> webArtworks(metadata.artworks().size()); | |
| 26 for (size_t i = 0; i < metadata.artworks().size(); ++i) { | |
| 27 const MediaArtworkInit& metaArtwork = metadata.artworks()[i]; | |
| 28 MediaArtwork* artwork = MediaArtwork::create(context, metaArtwork); | |
| 29 m_artworks.append(artwork); | |
|
mlamouri (slow - plz ping)
2016/06/02 16:10:06
Why do you need `m_artworks` compared to m_data.ar
Zhiqiang Zhang (Slow)
2016/06/03 16:07:31
Done. Now I don't save a copy of WebMediaMetadata
| |
| 30 webArtworks[i] = *artwork->data(); | |
| 31 m_data.artworks.swap(webArtworks); | |
| 32 } | |
| 33 } | |
| 23 } | 34 } |
| 24 | 35 |
| 25 String MediaMetadata::title() const | 36 String MediaMetadata::title() const |
| 26 { | 37 { |
| 27 return m_data.title; | 38 return m_data.title; |
| 28 } | 39 } |
| 29 | 40 |
| 30 String MediaMetadata::artist() const | 41 String MediaMetadata::artist() const |
| 31 { | 42 { |
| 32 return m_data.artist; | 43 return m_data.artist; |
| 33 } | 44 } |
| 34 | 45 |
| 35 String MediaMetadata::album() const | 46 String MediaMetadata::album() const |
| 36 { | 47 { |
| 37 return m_data.album; | 48 return m_data.album; |
| 38 } | 49 } |
| 39 | 50 |
| 51 HeapVector<Member<MediaArtwork>> MediaMetadata::artworks() const | |
| 52 { | |
| 53 return m_artworks; | |
| 54 } | |
| 55 | |
| 40 } // namespace blink | 56 } // namespace blink |
| OLD | NEW |