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

Side by Side Diff: cc/tiles/checker_image_tracker_unittest.cc

Issue 2857923004: cc: Keep PaintImage in DrawImage. (Closed)
Patch Set: dependent branch Created 3 years, 7 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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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/tiles/checker_image_tracker.h" 5 #include "cc/tiles/checker_image_tracker.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 dimension = kSmallNonCheckerableImageDimension; 95 dimension = kSmallNonCheckerableImageDimension;
96 break; 96 break;
97 case ImageType::LARGE_NON_CHECKERABLE: 97 case ImageType::LARGE_NON_CHECKERABLE:
98 dimension = kLargeNonCheckerableImageDimension; 98 dimension = kLargeNonCheckerableImageDimension;
99 break; 99 break;
100 } 100 }
101 101
102 sk_sp<SkImage> image = 102 sk_sp<SkImage> image =
103 CreateDiscardableImage(gfx::Size(dimension, dimension)); 103 CreateDiscardableImage(gfx::Size(dimension, dimension));
104 gfx::ColorSpace target_color_space = gfx::ColorSpace::CreateSRGB(); 104 gfx::ColorSpace target_color_space = gfx::ColorSpace::CreateSRGB();
105 return DrawImage(image, SkIRect::MakeWH(image->width(), image->height()), 105 return DrawImage(PaintImage(image),
106 SkIRect::MakeWH(image->width(), image->height()),
106 kNone_SkFilterQuality, SkMatrix::I(), target_color_space); 107 kNone_SkFilterQuality, SkMatrix::I(), target_color_space);
107 } 108 }
108 109
109 CheckerImageTracker::ImageDecodeQueue BuildImageDecodeQueue( 110 CheckerImageTracker::ImageDecodeQueue BuildImageDecodeQueue(
110 std::vector<DrawImage> draw_images, 111 std::vector<DrawImage> draw_images,
111 WhichTree tree) { 112 WhichTree tree) {
112 CheckerImageTracker::ImageDecodeQueue decode_queue; 113 CheckerImageTracker::ImageDecodeQueue decode_queue;
113 for (auto draw_image : draw_images) { 114 for (auto draw_image : draw_images) {
114 sk_sp<const SkImage> image = draw_image.image(); 115 sk_sp<const SkImage> image = draw_image.image();
115 if (checker_image_tracker_->ShouldCheckerImage(image, tree)) 116 if (checker_image_tracker_->ShouldCheckerImage(image, tree))
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 base::RunLoop().RunUntilIdle(); 328 base::RunLoop().RunUntilIdle();
328 EXPECT_EQ(image_controller_.decodes_requested().size(), 2U); 329 EXPECT_EQ(image_controller_.decodes_requested().size(), 2U);
329 EXPECT_EQ(image_controller_.decodes_requested().count( 330 EXPECT_EQ(image_controller_.decodes_requested().count(
330 checkerable_image3.image()->uniqueID()), 331 checkerable_image3.image()->uniqueID()),
331 1U); 332 1U);
332 EXPECT_EQ(image_controller_.num_of_locked_images(), 2); 333 EXPECT_EQ(image_controller_.num_of_locked_images(), 2);
333 } 334 }
334 335
335 } // namespace 336 } // namespace
336 } // namespace cc 337 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698