Bug 231062

Summary: SVG images drawn onto display-p3 canvas are flattened to sRGB
Product: WebKit Reporter: Cameron McCormack (:heycam) <heycam>
Component: CanvasAssignee: Cameron McCormack (:heycam) <heycam>
Status: RESOLVED FIXED    
Severity: Normal CC: cdumez, changseok, clopez, dino, eric.carlson, esprehn+autocc, ews-watchlist, fmalita, glenn, gyuyoung.kim, jer.noble, pdr, philipj, sabouhallawa, schenney, sergio, simon.fraser, webkit-bug-importer, youennf
Priority: P2 Keywords: InRadar
Version: WebKit Local Build   
Hardware: Unspecified   
OS: Unspecified   
See Also: https://github.com/web-platform-tests/wpt/pull/31108
https://bugs.webkit.org/show_bug.cgi?id=227748
Bug Depends on:    
Bug Blocks: 225140    
Attachments:
Description Flags
Patch
none
Patch with Image::draw / GraphicsContext::drawImage argument
none
Patch none

Cameron McCormack (:heycam)
Reported 2021-09-30 22:03:16 PDT
.
Attachments
Patch (75.62 KB, patch)
2021-09-30 22:25 PDT, Cameron McCormack (:heycam) 		no flags
DetailsFormatted DiffDiff
Patch with Image::draw / GraphicsContext::drawImage argument (89.53 KB, patch)
2021-10-01 15:36 PDT, Cameron McCormack (:heycam) 		no flags
DetailsFormatted DiffDiff
Patch (76.95 KB, patch)
2021-10-04 18:36 PDT, Cameron McCormack (:heycam) 		no flags
DetailsFormatted DiffDiff
Show Obsolete (2) View All Add attachment proposed patch, testcase, etc.
Radar WebKit Bug Importer
Comment 1 2021-09-30 22:03:36 PDT
<rdar://problem/83752451>
Cameron McCormack (:heycam)
Comment 2 2021-09-30 22:03:59 PDT
We draw the SVG image into a NativeImage so it can be sent to the GPU process.
Cameron McCormack (:heycam)
Comment 3 2021-09-30 22:25:52 PDT
Created attachment 439822 [details] Patch
EWS Watchlist
Comment 4 2021-09-30 22:27:06 PDT
This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess
Simon Fraser (smfr)
Comment 5 2021-10-01 14:14:26 PDT
Comment on attachment 439822 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439822&action=review > Source/WebCore/platform/graphics/GraphicsContext.h:433 > + virtual ImageDrawResult drawImageForCanvas(Image&, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions&, DestinationColorSpace canvasColorSpace); Not a fan of "for canvas" down here in GraphicsContext. Can we just an std::optional<DestinationColorSpace> to an existing function? > Source/WebCore/svg/graphics/SVGImage.h:102 > + ImageDrawResult drawForCanvas(GraphicsContext&, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions&, DestinationColorSpace) final; > + ImageDrawResult drawAsNativeImage(GraphicsContext&, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions&, DestinationColorSpace); > ImageDrawResult drawForContainer(GraphicsContext&, const FloatSize containerSize, float containerZoom, const URL& initialFragmentURL, const FloatRect& dstRect, const FloatRect& srcRect, const ImagePaintingOptions& = { }); > + ImageDrawResult drawForContainerInternal(GraphicsContext&, const FloatSize containerSize, float containerZoom, const URL& initialFragmentURL, const FloatRect& dstRect, const FloatRect& srcRect, const ImagePaintingOptions&, DestinationColorSpace); > + ImageDrawResult drawInternal(GraphicsContext&, const FloatRect& destination, const FloatRect& source, const ImagePaintingOptions&, DestinationColorSpace); > + ImageDrawResult drawForCanvasForContainer(GraphicsContext&, const FloatSize containerSize, float containerZoom, const URL& initialFragmentURL, const FloatRect& dstRect, const FloatRect& srcRect, const ImagePaintingOptions&, DestinationColorSpace); That's quite a bit of proliferation too. Can std::optional<DestinationColorSpace> help?
Cameron McCormack (:heycam)
Comment 6 2021-10-01 14:22:06 PDT
(In reply to Simon Fraser (smfr) from comment #5) > Can we just an std::optional<DestinationColorSpace> to an existing function? That was my first thought. There were many subclasses to add that to. Maybe that's better than adding the separate functions here.
Cameron McCormack (:heycam)
Comment 7 2021-10-01 15:36:41 PDT
Created attachment 439920 [details] Patch with Image::draw / GraphicsContext::drawImage argument
Cameron McCormack (:heycam)
Comment 8 2021-10-01 15:40:57 PDT
There's a version of the patch with a std::optional<DestinationColorSpace> argument. And I could be convinced not to make it optional (or std::optional<>) so that all drawImage/draw callers have to pass in an intermediate color space.
Cameron McCormack (:heycam)
Comment 9 2021-10-04 18:35:50 PDT
Submitted web-platform-tests pull request: https://github.com/web-platform-tests/wpt/pull/31108
Cameron McCormack (:heycam)
Comment 10 2021-10-04 18:36:34 PDT
Created attachment 440139 [details] Patch
EWS
Comment 11 2021-10-04 19:33:03 PDT
Committed r283531 (242497@main): <https://commits.webkit.org/242497@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440139 [details].
Note You need to log in before you can comment on or make changes to this bug.