OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "content/public/common/media_metadata.h" | 5 #include "content/public/common/media_metadata.h" |
6 | 6 |
7 #include <algorithm> | |
8 | |
7 namespace content { | 9 namespace content { |
8 | 10 |
9 const size_t MediaMetadata::kMaxIPCStringLength = 4 * 1024; | 11 const size_t MediaMetadata::kMaxIPCStringLength = 4 * 1024; |
12 const size_t MediaMetadata::kMaxArtworkTypeLength = 2 * 127 + 1; | |
10 | 13 |
11 MediaMetadata::MediaMetadata() = default; | 14 MediaMetadata::MediaMetadata() = default; |
12 | 15 |
13 MediaMetadata::~MediaMetadata() = default; | 16 MediaMetadata::~MediaMetadata() = default; |
14 | 17 |
15 bool MediaMetadata::operator==(const MediaMetadata& other) const { | 18 bool MediaMetadata::operator==(const MediaMetadata& other) const { |
16 return title == other.title && artist == other.artist && album == other.album; | 19 return title == other.title && artist == other.artist && |
20 album == other.album && artwork == other.artwork; | |
17 } | 21 } |
18 | 22 |
19 bool MediaMetadata::operator!=(const MediaMetadata& other) const { | 23 bool MediaMetadata::operator!=(const MediaMetadata& other) const { |
20 return !this->operator==(other); | 24 return !this->operator==(other); |
21 } | 25 } |
22 | 26 |
27 base::Optional<MediaMetadata::Artwork> MediaMetadata::SanitizeArtwork( | |
28 const MediaMetadata::Artwork& artwork) { | |
29 if (!artwork.src.is_valid() || !artwork.src.IsStandard() || | |
30 (!artwork.src.SchemeIsHTTPOrHTTPS() && | |
31 !artwork.src.SchemeIsFile())) { | |
32 return base::nullopt; | |
33 } | |
34 Artwork sanitized_artwork; | |
35 sanitized_artwork.src = artwork.src; | |
jochen (gone - plz use gerrit)
2016/06/27 08:12:40
should we put some length limit on the url?
Zhiqiang Zhang (Slow)
2016/06/28 13:57:00
Limiting to 4K, maybe palmer@ can have more commen
| |
36 sanitized_artwork.type = artwork.type.is_null() ? | |
37 base::NullableString16() : | |
38 base::NullableString16( | |
39 artwork.type.string().substr(0, kMaxArtworkTypeLength), | |
40 false); | |
41 std::copy(artwork.sizes.begin(), artwork.sizes.end(), | |
42 sanitized_artwork.sizes.begin()); | |
43 return sanitized_artwork; | |
jochen (gone - plz use gerrit)
2016/06/27 08:12:40
can you avoid creating a copy of the artwork if it
Zhiqiang Zhang (Slow)
2016/06/28 13:57:01
Done. Early-returning if it's sane.
| |
44 } | |
45 | |
23 } // namespace content | 46 } // namespace content |
OLD | NEW |