995832 - Make DrawTargetSkia::DrawSurface accept any surface type

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Jonathan Watt [:jwatt]]

The latest Try failure I'm debugging with the patch for bug 950372 is failures on the tests under:

https://mxr.mozilla.org/mozilla-central/source/image/test/reftest/encoders-lossless/

This test loads a PNG in an <img> and then paints that <img> to a canvas using:

CanvasRenderingContext2D::DrawImage(const HTMLImageOrCanvasOrVideoElement& image, ...)

Under that DrawImage function we call RasterImage::GetFrame() and then it passes the SourceSurface to DrawTargetSkia::DrawSurface. It turns out the reason the tests fail is because RasterImage::GetFrame now returns a SourceSurfaceCairo and DrawTargetSkia::DrawSurface just silently returns if the passed in SourceSurface isn't of type SurfaceType::SKIA or SurfaceType::DATA.

I think DrawTargetSkia::DrawSurface should call GetDataSurface on the surface that is passed in if it's not of these types.

Comment 1

[Jonathan Watt [:jwatt]]

Attachment: patch

Comment 2

[Andreas Gal :gal]

I wanted to do this before but Bas stopped me and said that we intentionally don't want backends to inter-operate. Instead you should extract that data and wrap it into a data surface and pass that in.

Comment 3

[George Wright (:gw280) (needinfo me!)]

Comment on attachment 8405935 [details] [diff] [review]
patch

Review of attachment 8405935 [details] [diff] [review]:
-----------------------------------------------------------------

Looks ok. Not sure I'm a fan of re-using the "aSurface" pointer like that, but otherwise no issues.

Comment 4

[Jonathan Watt [:jwatt]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/44e4463a8eeb

Comment 5

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/44e4463a8eeb