-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
scoped_refptr<base::SequencedTaskRunner> task_runner)
: image_controller_(controller),
task_runner_(std::move(task_runner)),
- tick_clock_(base::DefaultTickClock::GetInstance()),
- weak_ptr_factory_(this) {
+ tick_clock_(base::DefaultTickClock::GetInstance()) {
DCHECK(image_controller_);
}
void DecodedImageTracker::QueueImageDecode(
const PaintImage& image,
+ const TargetColorParams& target_color_params,
base::OnceCallback<void(bool)> callback) {
size_t frame_index = PaintImage::kDefaultFrameIndex;
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("cc.debug"),
// Queue the decode in the image controller, but switch out the callback for
// our own.
auto image_bounds = SkIRect::MakeWH(image.width(), image.height());
- DrawImage draw_image(image, image_bounds, kNone_SkFilterQuality,
- SkMatrix::I(), frame_index);
+ DrawImage draw_image(image, false, image_bounds,
+ PaintFlags::FilterQuality::kNone, SkM44(), frame_index,
+ target_color_params);
image_controller_->QueueImageDecode(
draw_image, base::BindOnce(&DecodedImageTracker::ImageDecodeFinished,
base::Unretained(this), std::move(callback),
return;
auto now = tick_clock_->NowTicks();
- auto timeout = base::TimeDelta::FromMilliseconds(kTimeoutDurationMs);
+ auto timeout = base::Milliseconds(kTimeoutDurationMs);
for (auto it = locked_images_.begin(); it != locked_images_.end();) {
auto& image = it->second;
if (now - image->lock_time() < timeout) {
FROM_HERE,
base::BindOnce(&DecodedImageTracker::OnTimeoutImages,
weak_ptr_factory_.GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(kTimeoutDurationMs));
+ base::Milliseconds(kTimeoutDurationMs));
}
} // namespace cc