cc: Keep PaintImage in DrawImage.

cc/tiles/checker_image_tracker.h

 // 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.
 
 #ifndef CC_TILES_CHECKER_IMAGE_TRACKER_H_
 #define CC_TILES_CHECKER_IMAGE_TRACKER_H_
 
 #include <unordered_map>
 #include <vector>
 
+#include "base/optional.h"
 #include "cc/cc_export.h"
 #include "cc/paint/image_id.h"
 #include "cc/tiles/image_controller.h"
 #include "third_party/skia/include/core/SkImage.h"
 
 namespace cc {
 
 class CC_EXPORT CheckerImageTrackerClient {
  public:
   virtual ~CheckerImageTrackerClient() = default;
@@ skipping 11 matching lines @@
 // sync tree until the previous tree is activated.
 class CC_EXPORT CheckerImageTracker {
  public:
   CheckerImageTracker(ImageController* image_controller,
                       CheckerImageTrackerClient* client,
                       bool enable_checker_imaging);
   ~CheckerImageTracker();
 
   // Returns true if the decode for |image| will be deferred to the image decode
   // service and it should be be skipped during raster.
-  bool ShouldCheckerImage(const sk_sp<const SkImage>& image, WhichTree tree);
+  bool ShouldCheckerImage(const PaintImage& image, WhichTree tree);
 
-  using ImageDecodeQueue = std::vector<sk_sp<const SkImage>>;
+  using ImageDecodeQueue = std::vector<PaintImage>;
   void ScheduleImageDecodeQueue(ImageDecodeQueue image_decode_queue);
 
   // Returns the set of images to invalidate on the sync tree.
-  const ImageIdFlatSet& TakeImagesToInvalidateOnSyncTree();
+  const PaintImageIdFlatSet& TakeImagesToInvalidateOnSyncTree();
 
   // Called when the sync tree is activated. Each call to
   // TakeImagesToInvalidateOnSyncTree() must be followed by this when the
   // invalidated sync tree is activated.
   void DidActivateSyncTree();
 
   // Called to reset the tracker state on navigation. This will release all
   // cached images. Setting |can_clear_decode_policy_tracking| will also result
   // in re-checkering any images already decoded by the tracker.
   void ClearTracker(bool can_clear_decode_policy_tracking);
@@ skipping 20 matching lines @@
         : controller_(controller), request_id_(request_id) {}
     ~ScopedDecodeHolder() { controller_->UnlockImageDecode(request_id_); }
 
    private:
     ImageController* controller_;
     ImageController::ImageDecodeRequestId request_id_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedDecodeHolder);
   };
 
-  void DidFinishImageDecode(ImageId image_id,
+  void DidFinishImageDecode(PaintImage::Id image_id,
                             ImageController::ImageDecodeRequestId request_id,
                             ImageController::ImageDecodeResult result);
 
   // Called when the next request in the |image_decode_queue_| should be
   // scheduled with the image decode service.
   void ScheduleNextImageDecode();
 
   ImageController* image_controller_;
   CheckerImageTrackerClient* client_;
   const bool enable_checker_imaging_;
 
   // A set of images which have been decoded and are pending invalidation for
   // raster on the checkered tiles.
-  ImageIdFlatSet images_pending_invalidation_;
+  PaintImageIdFlatSet images_pending_invalidation_;
 
   // A set of images which were invalidated on the current sync tree.
-  ImageIdFlatSet invalidated_images_on_current_sync_tree_;
+  PaintImageIdFlatSet invalidated_images_on_current_sync_tree_;
 
   // The queue of images pending decode. We maintain a queue to ensure that the
   // order in which images are decoded is aligned with the priority of the tiles
   // dependent on these images.
   ImageDecodeQueue image_decode_queue_;
 
   // The currently outstanding image decode that has been scheduled with the
   // decode service. There can be only one outstanding decode at a time.
-  sk_sp<const SkImage> outstanding_image_decode_;
+  base::Optional<PaintImage> outstanding_image_decode_;
 
   // A map of ImageId to its DecodePolicy.
-  std::unordered_map<ImageId, DecodePolicy> image_async_decode_state_;
+  std::unordered_map<PaintImage::Id, DecodePolicy> image_async_decode_state_;
 
   // A map of image id to image decode request id for images to be unlocked.
-  std::unordered_map<ImageId, std::unique_ptr<ScopedDecodeHolder>>
+  std::unordered_map<PaintImage::Id, std::unique_ptr<ScopedDecodeHolder>>
       image_id_to_decode_;
 
   base::WeakPtrFactory<CheckerImageTracker> weak_factory_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TILES_CHECKER_IMAGE_TRACKER_H_