| 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 "cc/blimp/picture_data_conversions.h" | 5 #include "cc/blimp/picture_data_conversions.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 DCHECK(stream.bytesWritten()); | 36 DCHECK(stream.bytesWritten()); |
| 37 return sk_sp<SkData>(stream.copyToData()); | 37 return sk_sp<SkData>(stream.copyToData()); |
| 38 } | 38 } |
| 39 | 39 |
| 40 bool SamePicture(sk_sp<const SkPicture> picture, | 40 bool SamePicture(sk_sp<const SkPicture> picture, |
| 41 const PictureData& picture_data) { | 41 const PictureData& picture_data) { |
| 42 if (picture->uniqueID() != picture_data.unique_id) | 42 if (picture->uniqueID() != picture_data.unique_id) |
| 43 return false; | 43 return false; |
| 44 | 44 |
| 45 sk_sp<const SkData> serialized_picture = SerializePicture(picture); | 45 sk_sp<const SkData> serialized_picture = SerializePicture(picture); |
| 46 return picture_data.data->equals(serialized_picture); | 46 return picture_data.data->equals(serialized_picture.get()); |
| 47 } | 47 } |
| 48 | 48 |
| 49 PictureData CreatePictureData(sk_sp<const SkPicture> picture) { | 49 PictureData CreatePictureData(sk_sp<const SkPicture> picture) { |
| 50 return PictureData(picture->uniqueID(), SerializePicture(picture)); | 50 return PictureData(picture->uniqueID(), SerializePicture(picture)); |
| 51 } | 51 } |
| 52 | 52 |
| 53 TEST(PictureCacheConversionsTest, SerializePictureCaheUpdate) { | 53 TEST(PictureCacheConversionsTest, SerializePictureCaheUpdate) { |
| 54 sk_sp<const SkPicture> picture1 = CreateSkPicture(SK_ColorRED); | 54 sk_sp<const SkPicture> picture1 = CreateSkPicture(SK_ColorRED); |
| 55 sk_sp<const SkPicture> picture2 = CreateSkPicture(SK_ColorBLUE); | 55 sk_sp<const SkPicture> picture2 = CreateSkPicture(SK_ColorBLUE); |
| 56 std::vector<PictureData> update; | 56 std::vector<PictureData> update; |
| 57 update.push_back(CreatePictureData(picture1)); | 57 update.push_back(CreatePictureData(picture1)); |
| 58 update.push_back(CreatePictureData(picture2)); | 58 update.push_back(CreatePictureData(picture2)); |
| 59 | 59 |
| 60 proto::SkPictures proto_pictures; | 60 proto::SkPictures proto_pictures; |
| 61 PictureDataVectorToSkPicturesProto(update, &proto_pictures); | 61 PictureDataVectorToSkPicturesProto(update, &proto_pictures); |
| 62 ASSERT_EQ(2, proto_pictures.pictures_size()); | 62 ASSERT_EQ(2, proto_pictures.pictures_size()); |
| 63 | 63 |
| 64 std::vector<PictureData> deserialized = | 64 std::vector<PictureData> deserialized = |
| 65 SkPicturesProtoToPictureDataVector(proto_pictures); | 65 SkPicturesProtoToPictureDataVector(proto_pictures); |
| 66 | 66 |
| 67 ASSERT_EQ(2U, deserialized.size()); | 67 ASSERT_EQ(2U, deserialized.size()); |
| 68 PictureData picture_data_1 = deserialized.at(0); | 68 PictureData picture_data_1 = deserialized.at(0); |
| 69 PictureData picture_data_2 = deserialized.at(1); | 69 PictureData picture_data_2 = deserialized.at(1); |
| 70 EXPECT_TRUE(SamePicture(picture1, picture_data_1)); | 70 EXPECT_TRUE(SamePicture(picture1, picture_data_1)); |
| 71 EXPECT_TRUE(SamePicture(picture2, picture_data_2)); | 71 EXPECT_TRUE(SamePicture(picture2, picture_data_2)); |
| 72 } | 72 } |
| 73 | 73 |
| 74 } // namespace | 74 } // namespace |
| 75 } // namespace cc | 75 } // namespace cc |
| OLD | NEW |