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

Unified Diff: cc/raster/raster_buffer_provider.cc

Issue 2752523006: cc: Use SkCreateColorSpaceXformCanvas for color transforms (Closed)
Patch Set: Rebase Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/raster/raster_buffer_provider.h ('k') | cc/raster/zero_copy_raster_buffer_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/raster/raster_buffer_provider.cc
diff --git a/cc/raster/raster_buffer_provider.cc b/cc/raster/raster_buffer_provider.cc
index 98e366f04a0a0d0dfb4bb503a54110f9de7050d4..2a6b4bb41619b94bb2bb79f8f0356b628b533753 100644
--- a/cc/raster/raster_buffer_provider.cc
+++ b/cc/raster/raster_buffer_provider.cc
@@ -53,7 +53,7 @@ void RasterBufferProvider::PlaybackToMemory(
const gfx::Rect& canvas_bitmap_rect,
const gfx::Rect& canvas_playback_rect,
float scale,
- sk_sp<SkColorSpace> dst_color_space,
+ const gfx::ColorSpace& target_color_space,
const RasterSource::PlaybackSettings& playback_settings) {
TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug"),
"RasterBufferProvider::PlaybackToMemory");
@@ -61,8 +61,8 @@ void RasterBufferProvider::PlaybackToMemory(
DCHECK(IsSupportedPlaybackToMemoryFormat(format)) << format;
// Uses kPremul_SkAlphaType since the result is not known to be opaque.
- SkImageInfo info = SkImageInfo::MakeN32(size.width(), size.height(),
- kPremul_SkAlphaType, dst_color_space);
+ SkImageInfo info =
+ SkImageInfo::MakeN32(size.width(), size.height(), kPremul_SkAlphaType);
// Use unknown pixel geometry to disable LCD text.
SkSurfaceProps surface_props(0, kUnknown_SkPixelGeometry);
@@ -81,9 +81,9 @@ void RasterBufferProvider::PlaybackToMemory(
case RGBA_F16: {
sk_sp<SkSurface> surface =
SkSurface::MakeRasterDirect(info, memory, stride, &surface_props);
- raster_source->PlaybackToCanvas(surface->getCanvas(), canvas_bitmap_rect,
- canvas_playback_rect, scale,
- playback_settings);
+ raster_source->PlaybackToCanvas(surface->getCanvas(), target_color_space,
+ canvas_bitmap_rect, canvas_playback_rect,
+ scale, playback_settings);
return;
}
case RGBA_4444:
@@ -91,9 +91,9 @@ void RasterBufferProvider::PlaybackToMemory(
sk_sp<SkSurface> surface = SkSurface::MakeRaster(info, &surface_props);
// TODO(reveman): Improve partial raster support by reducing the size of
// playback rect passed to PlaybackToCanvas. crbug.com/519070
- raster_source->PlaybackToCanvas(surface->getCanvas(), canvas_bitmap_rect,
- canvas_bitmap_rect, scale,
- playback_settings);
+ raster_source->PlaybackToCanvas(surface->getCanvas(), target_color_space,
+ canvas_bitmap_rect, canvas_bitmap_rect,
+ scale, playback_settings);
if (format == ETC1) {
TRACE_EVENT0("cc",
« no previous file with comments | « cc/raster/raster_buffer_provider.h ('k') | cc/raster/zero_copy_raster_buffer_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698