Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Side by Side Diff: content/public/common/media_metadata.cc

Issue 2015433003: Implement MediaMetadata artwork in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: adding sanitize check for artwork Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 int MediaMetadata::kMaxIconSize = 4 * 1024;
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())) {
palmer 2016/06/20 21:34:21 Is there any chance that allowing file: URLs here
Zhiqiang Zhang (Slow) 2016/06/21 11:08:42 The image is fetched via WebContents::DownloadImag
32 return base::nullopt;
33 }
34 Artwork sanitized_artwork;
35 sanitized_artwork.src = artwork.src;
36 sanitized_artwork.type = artwork.type.is_null() ?
37 base::NullableString16() :
38 base::NullableString16(
39 artwork.type.string().substr(0, kMaxIPCStringLength),
palmer 2016/06/20 21:34:21 Is the range of valid types really the set of stri
Zhiqiang Zhang (Slow) 2016/06/21 11:08:42 Hmm, we actually allow any string here (see Manife
40 false);
41 std::copy_if(artwork.sizes.begin(), artwork.sizes.end(),
42 sanitized_artwork.sizes.begin(),
43 [](const gfx::Size& size) {
44 return size.width() >= 0 && size.width() <= kMaxIconSize &&
45 size.height() >= 0 && size.height() <= kMaxIconSize; });
46 return sanitized_artwork;
47 }
48
23 } // namespace content 49 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698