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 #include "cc/playback/image_hijack_canvas.h" | 4 #include "cc/playback/image_hijack_canvas.h" |
5 | 5 |
6 #include "cc/tiles/image_decode_cache.h" | 6 #include "cc/tiles/image_decode_cache.h" |
7 #include "testing/gmock/include/gmock/gmock.h" | 7 #include "testing/gmock/include/gmock/gmock.h" |
8 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
9 #include "third_party/skia/include/core/SkBitmap.h" | 9 #include "third_party/skia/include/core/SkBitmap.h" |
10 #include "third_party/skia/include/core/SkImage.h" | 10 #include "third_party/skia/include/core/SkImage.h" |
(...skipping 18 matching lines...) Expand all Loading... |
29 MOCK_METHOD1(SetShouldAggressivelyFreeResources, | 29 MOCK_METHOD1(SetShouldAggressivelyFreeResources, |
30 void(bool aggressively_free_resources)); | 30 void(bool aggressively_free_resources)); |
31 MOCK_METHOD2(GetOutOfRasterDecodeTaskForImageAndRef, | 31 MOCK_METHOD2(GetOutOfRasterDecodeTaskForImageAndRef, |
32 bool(const DrawImage& image, scoped_refptr<TileTask>* task)); | 32 bool(const DrawImage& image, scoped_refptr<TileTask>* task)); |
33 }; | 33 }; |
34 | 34 |
35 TEST(ImageHijackCanvasTest, NonLazyImagesSkipped) { | 35 TEST(ImageHijackCanvasTest, NonLazyImagesSkipped) { |
36 // Use a strict mock so that if *any* ImageDecodeCache methods are called, we | 36 // Use a strict mock so that if *any* ImageDecodeCache methods are called, we |
37 // will hit an error. | 37 // will hit an error. |
38 testing::StrictMock<MockImageDecodeCache> image_decode_cache; | 38 testing::StrictMock<MockImageDecodeCache> image_decode_cache; |
39 ImageHijackCanvas canvas(100, 100, &image_decode_cache); | 39 std::unordered_set<ImageId> images_to_skip; |
| 40 ImageHijackCanvas canvas(100, 100, &image_decode_cache, &images_to_skip); |
40 | 41 |
41 // Use an SkBitmap backed image to ensure that the image is not | 42 // Use an SkBitmap backed image to ensure that the image is not |
42 // lazy-generated. | 43 // lazy-generated. |
43 SkBitmap bitmap; | 44 SkBitmap bitmap; |
44 bitmap.allocN32Pixels(10, 10, true); | 45 bitmap.allocN32Pixels(10, 10, true); |
45 sk_sp<SkImage> image = SkImage::MakeFromBitmap(bitmap); | 46 sk_sp<SkImage> image = SkImage::MakeFromBitmap(bitmap); |
46 | 47 |
47 SkPaint paint; | 48 SkPaint paint; |
48 canvas.drawImage(image, 0, 0, &paint); | 49 canvas.drawImage(image, 0, 0, &paint); |
49 canvas.drawImageRect(image, SkRect::MakeXYWH(0, 0, 10, 10), | 50 canvas.drawImageRect(image, SkRect::MakeXYWH(0, 0, 10, 10), |
50 SkRect::MakeXYWH(10, 10, 10, 10), &paint); | 51 SkRect::MakeXYWH(10, 10, 10, 10), &paint); |
51 | 52 |
52 SkPaint image_paint; | 53 SkPaint image_paint; |
53 image_paint.setShader( | 54 image_paint.setShader( |
54 image->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode)); | 55 image->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode)); |
55 SkRect paint_rect = SkRect::MakeXYWH(0, 0, 100, 100); | 56 SkRect paint_rect = SkRect::MakeXYWH(0, 0, 100, 100); |
56 canvas.drawRect(paint_rect, image_paint); | 57 canvas.drawRect(paint_rect, image_paint); |
57 SkPath path; | 58 SkPath path; |
58 path.addRect(paint_rect, SkPath::kCW_Direction); | 59 path.addRect(paint_rect, SkPath::kCW_Direction); |
59 canvas.drawPath(path, image_paint); | 60 canvas.drawPath(path, image_paint); |
60 canvas.drawOval(paint_rect, image_paint); | 61 canvas.drawOval(paint_rect, image_paint); |
61 canvas.drawArc(paint_rect, 0, 40, true, image_paint); | 62 canvas.drawArc(paint_rect, 0, 40, true, image_paint); |
62 canvas.drawRRect(SkRRect::MakeRect(paint_rect), image_paint); | 63 canvas.drawRRect(SkRRect::MakeRect(paint_rect), image_paint); |
63 } | 64 } |
64 | 65 |
65 } // namespace | 66 } // namespace |
66 | 67 |
67 } // namespace cc | 68 } // namespace cc |
OLD | NEW |