cc: Move pre-decodes to background worker.

cc/tiles/checker_image_tracker_unittest.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/tiles/checker_image_tracker.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 67 matching lines @@
  public:
   enum class ImageType {
     CHECKERABLE,
     SMALL_NON_CHECKERABLE,
     LARGE_NON_CHECKERABLE
   };
 
   void SetUpTracker(bool checker_images_enabled) {
     checker_image_tracker_ = base::MakeUnique<CheckerImageTracker>(
         &image_controller_, this, checker_images_enabled);
+    checker_image_tracker_->SetMaxDecodePriorityAllowed(
+        CheckerImageTracker::DecodeType::kPreDecode);
   }
 
   void TearDown() override { checker_image_tracker_.reset(); }
 
   DrawImage CreateImage(
       ImageType image_type,
       PaintImage::AnimationType animation = PaintImage::AnimationType::STATIC,
       PaintImage::CompletionState completion =
           PaintImage::CompletionState::DONE,
       bool is_multipart = false) {
@@ skipping 17 matching lines @@
                      SkIRect::MakeWH(dimension, dimension),
                      kNone_SkFilterQuality, SkMatrix::I(), gfx::ColorSpace());
   }
 
   CheckerImageTracker::ImageDecodeQueue BuildImageDecodeQueue(
       std::vector<DrawImage> images,
       WhichTree tree) {
     CheckerImageTracker::ImageDecodeQueue decode_queue;
     for (const auto& image : images) {
       if (checker_image_tracker_->ShouldCheckerImage(image, tree))
-        decode_queue.push_back(image.paint_image());
+        decode_queue.push_back(CheckerImageTracker::ImageDecodeRequest(
+            image.paint_image(), CheckerImageTracker::DecodeType::kRaster));
     }
     return decode_queue;
   }
 
   // CheckerImageTrackerClient implementation.
   void NeedsInvalidationForCheckerImagedTiles() override {
     invalidation_request_pending_ = true;
   }
 
  protected:
@@ skipping 27 matching lines @@
   CheckerImageTracker::ImageDecodeQueue image_decode_queue;
 
   // First request to filter images.
   std::vector<DrawImage> draw_images = {
       checkerable_image, small_non_checkerable_image,
       large_non_checkerable_image, checkerable_image};
   image_decode_queue =
       BuildImageDecodeQueue(draw_images, WhichTree::PENDING_TREE);
 
   ASSERT_EQ(2u, image_decode_queue.size());
-  EXPECT_EQ(checkerable_image.paint_image(), image_decode_queue[0]);
-  EXPECT_EQ(checkerable_image.paint_image(), image_decode_queue[1]);
+  EXPECT_EQ(checkerable_image.paint_image(), image_decode_queue[0].paint_image);
+  EXPECT_EQ(checkerable_image.paint_image(), image_decode_queue[1].paint_image);
 
   checker_image_tracker_->ScheduleImageDecodeQueue(image_decode_queue);
   EXPECT_EQ(image_controller_.num_of_locked_images(), 1);
 
   // Run pending task to indicate completion of decode request to the tracker.
   // This should send an impl-side invalidation request to the client. The
   // images must remain locked until the sync tree to which the invalidations
   // are added is activated.
   base::RunLoop().RunUntilIdle();
   EXPECT_TRUE(invalidation_request_pending_);
@@ skipping 224 matching lines @@
       CreateImage(ImageType::CHECKERABLE, PaintImage::AnimationType::STATIC,
                   PaintImage::CompletionState::PARTIALLY_DONE);
   DrawImage video_image =
       CreateImage(ImageType::CHECKERABLE, PaintImage::AnimationType::VIDEO);
   std::vector<DrawImage> draw_images = {static_image, animated_image,
                                         partial_image, video_image};
 
   CheckerImageTracker::ImageDecodeQueue image_decode_queue =
       BuildImageDecodeQueue(draw_images, WhichTree::PENDING_TREE);
   EXPECT_EQ(image_decode_queue.size(), 1U);
-  EXPECT_EQ(image_decode_queue[0], static_image.paint_image());
+  EXPECT_EQ(image_decode_queue[0].paint_image, static_image.paint_image());
 
   // Change the partial image to complete and try again. It should sstill not
   // be checkered.
   gfx::Size image_size = gfx::Size(partial_image.image()->width(),
                                    partial_image.image()->height());
   DrawImage completed_paint_image =
       DrawImage(PaintImage(partial_image.paint_image().stable_id(),
                            CreateDiscardableImage(image_size)),
                 SkIRect::MakeWH(image_size.width(), image_size.height()),
                 kNone_SkFilterQuality, SkMatrix::I(), gfx::ColorSpace());
@@ skipping 51 matching lines @@
       CreateImage(ImageType::CHECKERABLE, PaintImage::AnimationType::STATIC,
                   PaintImage::CompletionState::DONE, true);
   EXPECT_TRUE(multi_part_image.paint_image().is_multipart());
 
   EXPECT_TRUE(checker_image_tracker_->ShouldCheckerImage(
       image, WhichTree::PENDING_TREE));
   EXPECT_FALSE(checker_image_tracker_->ShouldCheckerImage(
       multi_part_image, WhichTree::PENDING_TREE));
 }
 
+TEST_F(CheckerImageTrackerTest, RespectsDecodePriority) {
+  SetUpTracker(true);
+
+  DrawImage image1 = CreateImage(ImageType::CHECKERABLE);
+  DrawImage image2 = CreateImage(ImageType::CHECKERABLE);
+  DrawImage image3 = CreateImage(ImageType::CHECKERABLE);
+  DrawImage image4 = CreateImage(ImageType::CHECKERABLE);
+  CheckerImageTracker::ImageDecodeQueue image_decode_queue =
+      BuildImageDecodeQueue({image1, image2, image3, image4},
+                            WhichTree::PENDING_TREE);
+
+  // Mark the last 2 images as pre-decode.
+  EXPECT_EQ(image_decode_queue.size(), 4u);
+  image_decode_queue[2].type = CheckerImageTracker::DecodeType::kPreDecode;
+  image_decode_queue[3].type = CheckerImageTracker::DecodeType::kPreDecode;
+
+  // No decodes allowed. Nothing should be scheduled.
+  EXPECT_EQ(image_controller_.decoded_images().size(), 0u);
+  checker_image_tracker_->SetNoDecodesAllowed();
+  checker_image_tracker_->ScheduleImageDecodeQueue(image_decode_queue);
+  EXPECT_EQ(image_controller_.decoded_images().size(), 0u);
+
+  // Raster decodes allowed. Only those should be scheduled.
+  checker_image_tracker_->SetMaxDecodePriorityAllowed(
+      CheckerImageTracker::DecodeType::kRaster);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(image_controller_.decoded_images().size(), 2u);
+  EXPECT_EQ(image_controller_.decoded_images()[0], image1);
+  EXPECT_EQ(image_controller_.decoded_images()[1], image2);
+
+  // All decodes allowed. The complete queue should be flushed.
+  checker_image_tracker_->SetMaxDecodePriorityAllowed(
+      CheckerImageTracker::DecodeType::kPreDecode);
+  base::RunLoop().RunUntilIdle();
+  EXPECT_EQ(image_controller_.decoded_images()[0], image1);
+  EXPECT_EQ(image_controller_.decoded_images()[1], image2);
+  EXPECT_EQ(image_controller_.decoded_images()[2], image3);
+  EXPECT_EQ(image_controller_.decoded_images()[3], image4);
+}
+
 }  // namespace
 }  // namespace cc