chromium/src
0
Fork 0
Code Activity

Change calls to SkImage::makeSubset et al

Browse Source 
These were changed in http://review.skia.org/671679

Change-Id: Ifc7b9a0df94aa34319104b3d9ff7364a4dc31f9d
Bug: skia:14317
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4705004
Reviewed-by: ccameron chromium <ccameron@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Justin Novosad <junov@chromium.org>
Commit-Queue: Kevin Lubick <kjlubick@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1173046}
This commit is contained in:
Kevin Lubick
2023-07-20 17:14:39 +00:00
committed by Chromium LUCI CQ
parent b2dfd67d5a
commit 46368f77cb
9 changed files with 20 additions and 13 deletions

4
cc/paint/paint_image.cc

@ -260,8 +260,8 @@ bool PaintImage::DecodeFromSkImage(SkPixmap pixmap,
auto image = GetSkImageForFrame(frame_index, client_id);
DCHECK(image);
if (color_space) {
image = image->makeColorSpace(color_space,
static_cast<GrDirectContext*>(nullptr));
image = image->makeColorSpace(static_cast<GrDirectContext*>(nullptr),
color_space);
if (!image)
return false;
}

8
cc/tiles/gpu_image_decode_cache.cc

@ -465,8 +465,8 @@ sk_sp<SkImage> MakeTextureImage(viz::RasterContextProvider* context,
// Step 2: Apply a color-space conversion if necessary.
if (uploaded_image && target_color_space) {
sk_sp<SkImage> pre_converted_image = uploaded_image;
uploaded_image = uploaded_image->makeColorSpace(target_color_space,
context->GrContext());
uploaded_image = uploaded_image->makeColorSpace(context->GrContext(),
target_color_space);
if (uploaded_image != pre_converted_image)
DeleteSkImageAndPreventCaching(context, std::move(pre_converted_image));
@ -3542,8 +3542,8 @@ sk_sp<SkImage> GpuImageDecodeCache::CreateImageFromYUVATexturesInternal(
context_->GrContext(), yuva_backend_textures,
std::move(decoded_color_space));
if (target_color_space && yuva_image) {
return yuva_image->makeColorSpace(target_color_space,
context_->GrContext());
return yuva_image->makeColorSpace(context_->GrContext(),
target_color_space);
}
return yuva_image;

2
components/viz/service/display/software_renderer.cc

@ -855,7 +855,7 @@ sk_sp<SkShader> SoftwareRenderer::GetBackdropFilterShader(
// Crop the source image to the backdrop_filter_bounds.
sk_sp<SkImage> cropped_image = SkImages::RasterFromBitmap(backdrop_bitmap);
cropped_image = cropped_image->makeSubset(
RectToSkIRect(filter_clip), static_cast<GrDirectContext*>(nullptr));
static_cast<GrDirectContext*>(nullptr), RectToSkIRect(filter_clip));
cropped_image->asLegacyBitmap(&backdrop_bitmap);
image_offset = filter_clip.origin();
}

2
components/viz/test/fake_skia_output_surface.cc

@ -301,7 +301,7 @@ void FakeSkiaOutputSurface::CopyOutput(
GrDirectContext* direct = GrAsDirectContext(gr_context());
auto copy_image = surface->makeImageSnapshot()->makeSubset(
RectToSkIRect(geometry.sampling_bounds), direct);
direct, RectToSkIRect(geometry.sampling_bounds));
// Send copy request by copying into a bitmap.
SkBitmap bitmap;
copy_image->asLegacyBitmap(&bitmap);

2
pdf/paint_manager_unittest.cc

@ -107,6 +107,7 @@ class PaintManagerTest : public testing::Test {
// Check if snapshot has `overlapped_rect` painted red.
snapshot = snapshot->makeSubset(
static_cast<GrDirectContext*>(nullptr),
SkIRect::MakeWH(plugin_size.width(), plugin_size.height()));
ASSERT_TRUE(snapshot);
@ -160,6 +161,7 @@ class PaintManagerTest : public testing::Test {
// Compare snapshot to `expected_png`.
snapshot = snapshot->makeSubset(
static_cast<GrDirectContext*>(nullptr),
SkIRect::MakeWH(plugin_size.width(), plugin_size.height()));
ASSERT_TRUE(snapshot);

3
skia/BUILD.gn

@ -78,6 +78,9 @@ config("skia_config") {
"SK_DISABLE_LEGACY_SKSURFACE_FLUSH",
"SK_DISABLE_LEGACY_SKSURFACE_AS_IMAGE",
"SK_DISABLE_LEGACY_SKSURFACE_DISPLAYLIST",
"SK_DISABLE_LEGACY_IMAGE_SUBSET_METHODS",
"SK_DISABLE_LEGACY_IMAGE_COLORSPACE_METHODS",
"SK_DISABLE_LEGACY_IMAGE_RELEASE_PROCS",
]
include_dirs = [

1
third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_test.cc vendored

@ -1009,6 +1009,7 @@ static void TestDrawSingleHighBitDepthPNGOnCanvas(
resource_content->GetImage()->PaintImageForCurrentFrame().GetSwSkImage();
ASSERT_EQ(kRGBA_F16_SkColorType, decoded_image->colorType());
sk_sp<SkImage> color_converted_image = decoded_image->makeColorSpace(
static_cast<GrDirectContext*>(nullptr),
PredefinedColorSpaceToSkColorSpace(context_color_space));
float expected_pixels[16];
SkImageInfo expected_info_no_color_space = SkImageInfo::Make(

7
third_party/blink/renderer/platform/graphics/unaccelerated_static_bitmap_image.cc vendored

@ -114,10 +114,11 @@ UnacceleratedStaticBitmapImage::ConvertToColorSpace(
sk_sp<SkImage> skia_image = PaintImageForCurrentFrame().GetSwSkImage();
// If we don't need to change the color type, use SkImage::makeColorSpace()
if (skia_image->colorType() == color_type) {
skia_image = skia_image->makeColorSpace(color_space);
skia_image = skia_image->makeColorSpace(
static_cast<GrDirectContext*>(nullptr), color_space);
} else {
skia_image =
skia_image->makeColorTypeAndColorSpace(color_type, color_space);
skia_image = skia_image->makeColorTypeAndColorSpace(
static_cast<GrDirectContext*>(nullptr), color_type, color_space);
}
if (UNLIKELY(!skia_image)) {
// Null value indicates that skia failed to allocate the destination

4
ui/gfx/color_conversion_sk_filter_cache.cc

@ -268,7 +268,7 @@ sk_sp<SkImage> ColorConversionSkFilterCache::ConvertImage(
return image->makeColorSpace(graphite_recorder, target_color_space,
props);
} else {
return image->makeColorSpace(target_color_space, gr_context);
return image->makeColorSpace(gr_context, target_color_space);
}
}
@ -287,7 +287,7 @@ sk_sp<SkImage> ColorConversionSkFilterCache::ConvertImage(
return image->makeColorSpace(graphite_recorder, target_color_space,
props);
} else {
return image->makeColorSpace(target_color_space, gr_context);
return image->makeColorSpace(gr_context, target_color_space);
}
}