Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 784260; DrawTargetD2D should deal with Cairo surfaces in CreateBrush... . r=Bas

Browse Source 
--HG--
extra : rebase_source : 6f6226c1b22b6e863499a40268cb44afab799381
This commit is contained in:
Nicholas Cameron 2012-08-23 08:56:03 +12:00
parent 23ba347f48
commit d65d21e855
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/2d/DrawTargetCairo.cpp
View File

@ -151,6 +151,10 @@ GetCairoSurfaceForSourceSurface(SourceSurface *aSurface)
}
RefPtr<DataSourceSurface> data = aSurface->GetDataSurface();
if (!data) {
return nullptr;
}
cairo_surface_t* surf =
cairo_image_surface_create_for_data(data->GetData(),
GfxFormatToCairoFormat(data->GetFormat()),

15
gfx/2d/DrawTargetD2D.cpp
View File

@ -2090,19 +2090,20 @@ DrawTargetD2D::CreateBrushForPattern(const Pattern &aPattern, Float aAlpha)
AddDependencyOnSource(surf);
}
break;
case SURFACE_DATA:
default:
{
DataSourceSurface *dataSurf =
static_cast<DataSourceSurface*>(pat->mSurface.get());
bitmap = CreatePartialBitmapForSurface(dataSurf, mat, pat->mExtendMode);
RefPtr<DataSourceSurface> dataSurf = pat->mSurface->GetDataSurface();
if (!dataSurf) {
gfxWarning() << "Invalid surface type.";
return nullptr;
}
bitmap = CreatePartialBitmapForSurface(dataSurf, mat, pat->mExtendMode);
if (!bitmap) {
return nullptr;
}
}
break;
default:
break;
}
mRT->CreateBitmapBrush(bitmap,