943614 - Calling GetDataSurface() should always return a surface with surface->GetType() == SURFACE_DATA

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Markus Stange [:mstange]]

Attachment: part 1: Add DataSourceSurfaceWrapper and use it in the implementation of DataSourceSurface::GetDataSurface

This will make it easier to reject non-DataSourceSurfaces in DrawSurface when mixing DrawTargets and SourceSurfaces of different backends.

Comment 1

[Bas Schouten (:bas.schouten)]

Comment on attachment 8338834 [details] [diff] [review]
part 1: Add DataSourceSurfaceWrapper and use it in the implementation of DataSourceSurface::GetDataSurface

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

::: gfx/2d/DataSourceSurface.cpp
@@ +17,5 @@
> +    temp = this;
> +  } else {
> +    temp = new DataSourceSurfaceWrapper(this);
> +  }
> +  return temp.forget();

Don't need the .forget();

Comment 2

[Markus Stange [:mstange]]

Attachment: part 2: Use DataSourceSurfaceWrapper for SourceSurfaceCairo

Comment 3

[Markus Stange [:mstange]]

Attachment: part 3: Use DataSourceSurfaceWrapper for SourceSurfaceCG::GetDataSurface

Comment 4

[Markus Stange [:mstange]]

The other backends don't seem to need any fixing.

Comment 5

[Markus Stange [:mstange]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/990beb8dbc75
https://hg.mozilla.org/integration/mozilla-inbound/rev/366c57b68fe2
https://hg.mozilla.org/integration/mozilla-inbound/rev/a58f68a97132

Comment 6

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/990beb8dbc75
https://hg.mozilla.org/mozilla-central/rev/366c57b68fe2
https://hg.mozilla.org/mozilla-central/rev/a58f68a97132