Bug 1372577. Fallback to CPU alpha to luminance on the parent process. r=jrmuizel

This commit is contained in:
Mason Chang 2017-06-29 10:09:14 -07:00
Родитель e7bc7d572d
Коммит d59c1c2657
2 изменённых файлов: 8 добавлений и 3 удалений

Просмотреть файл

@ -15,6 +15,7 @@
#include "FilterNodeD2D1.h"
#include "ExtendInputEffectD2D1.h"
#include "Tools.h"
#include "nsAppRunner.h"
using namespace std;
@ -119,7 +120,10 @@ DrawTargetD2D1::EnsureLuminanceEffect()
already_AddRefed<SourceSurface>
DrawTargetD2D1::IntoLuminanceSource(LuminanceType aLuminanceType, float aOpacity)
{
if (aLuminanceType != LuminanceType::LUMINANCE) {
if ((aLuminanceType != LuminanceType::LUMINANCE) ||
// See bug 1372577, some race condition where we get invalid
// results with D2D in the parent process. Fallback in that case.
XRE_IsParentProcess()) {
return DrawTarget::IntoLuminanceSource(aLuminanceType, aOpacity);
}

Просмотреть файл

@ -27,8 +27,9 @@ fuzzy-if(skiaContent||winWidget,1,20000) == mask-image-2.html mask-image-2-ref.h
fuzzy-if(skiaContent||winWidget,1,43) == mask-image-3c.html mask-image-3-ref.html
fuzzy-if(skiaContent||winWidget,1,43) == mask-image-3d.html mask-image-3-ref.html
== mask-image-3e.html mask-image-3-ref.html
fuzzy-if(skiaContent||winWidget,50,85) fuzzy-if(webrender,1,126) fuzzy-if(d2d,255,1) == mask-image-3f.html mask-image-3-ref.html
fuzzy-if(skiaContent||winWidget,50,85) fuzzy-if(webrender,1,126) fuzzy-if(d2d,255,1) == mask-image-3g.html mask-image-3-ref.html
# Due to SVG luminance, see bug 1372577, parent process doesn't use d2d for luminance.
fuzzy-if(skiaContent||winWidget,50,85) fuzzy-if(webrender,1,126) fuzzy-if(d2d,255,1) fuzzy-if(winWidget&&!browserIsRemote,50,85) == mask-image-3f.html mask-image-3-ref.html
fuzzy-if(skiaContent||winWidget,50,85) fuzzy-if(webrender,1,126) fuzzy-if(d2d,255,1) fuzzy-if(winWidget&&!browserIsRemote,50,85) == mask-image-3g.html mask-image-3-ref.html
pref(layout.css.clip-path-shapes.enabled,true) fuzzy-if(winWidget,1,3) fuzzy-if(skiaContent,2,12) == mask-image-3h.html mask-image-3-ref.html
fuzzy-if(skiaContent,71,203) == mask-image-3i.html mask-image-3-ref.html
== mask-image-4a.html blank.html