Bug 1066668: Do not attempt to interop with D2D 1.1 inside D2D 1.0. r=jrmuizel

This commit is contained in:
Bas Schouten 2014-09-14 23:51:34 +02:00
parent 4ba13663b0
commit fe58303a8a

View File

@ -333,13 +333,8 @@ DrawTargetD2D::GetImageForSurface(SourceSurface *aSurface)
{
RefPtr<ID2D1Image> image;
if (aSurface->GetType() == SurfaceType::D2D1_1_IMAGE) {
image = static_cast<SourceSurfaceD2D1*>(aSurface)->GetImage();
static_cast<SourceSurfaceD2D1*>(aSurface)->EnsureIndependent();
} else {
Rect r(Point(), Size(aSurface->GetSize()));
image = GetBitmapForSurface(aSurface, r);
}
Rect r(Point(), Size(aSurface->GetSize()));
image = GetBitmapForSurface(aSurface, r);
return image;
}