Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1141642 - Fix disable-skia builds. r=jmuizelaar

Browse Source 
--HG--
extra : rebase_source : 6c6e1664973547b6131a5f5410bb0eec9afd750d
This commit is contained in:
Steve Singer 2015-04-18 19:44:00 +02:00
parent 3a94be560c
commit 4a748bd766
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/layers/basic/BasicCompositor.cpp
View File

@ -280,7 +280,7 @@ Transform(DataSourceSurface* aDest,
(uint32_t*)aSource->GetData(),
aSource->Stride());
NS_ABORT_IF_FALSE(src && dest, "Failed to create pixman images?");
MOZ_ASSERT(src !=0 && dest != 0, "Failed to create pixman images?");
pixman_transform pixTransform = Matrix3DToPixman(aTransform);
pixman_transform pixTransformInverted;

2
gfx/layers/basic/BasicLayerManager.cpp
View File

@ -711,7 +711,7 @@ Transform(const gfxImageSurface* aDest,
(uint32_t*)aSrc->GetData(),
aSrc->Stride());
NS_ABORT_IF_FALSE(src && dest, "Failed to create pixman images?");
MOZ_ASSERT(src != 0 && dest !=0, "Failed to create pixman images?");
pixman_transform pixTransform = BasicLayerManager_Matrix3DToPixman(aTransform);
pixman_transform pixTransformInverted;

3
image/src/moz.build
View File

@ -19,7 +19,6 @@ UNIFIED_SOURCES += [
'ClippedImage.cpp',
'DecodePool.cpp',
'Decoder.cpp',
'Downscaler.cpp',
'DynamicImage.cpp',
'FrameAnimator.cpp',
'FrozenImage.cpp',
@ -39,6 +38,8 @@ UNIFIED_SOURCES += [
'SVGDocumentWrapper.cpp',
'VectorImage.cpp',
]
if CONFIG['MOZ_ENABLE_SKIA']:
UNIFIED_SOURCES += [ 'Downscaler.cpp']
# These files can't be unified because of ImageLogging.h #include order issues.
SOURCES += [