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

Bug 1313276 - Part 2. Add comment for bug 1323912.

Browse Source 
MozReview-Commit-ID: CetQxWIr1sq

--HG--
extra : rebase_source : 9f3f4bc6c776dc52db32e38c5400343d49b9251a
This commit is contained in:
cku 2016-12-16 12:52:21 +08:00
parent 0a6e5bd441
commit e6edbb4877
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/painting/nsDisplayList.cpp
View File

@ -7353,6 +7353,8 @@ bool nsDisplayMask::ShouldPaintOnMaskLayer(LayerManager* aManager)
nsSVGUtils::MaskUsage maskUsage;
nsSVGUtils::DetermineMaskUsage(mFrame, mHandleOpacity, maskUsage);
// XXX Bug 1323912. nsSVGIntegrationUtils::PaintMask can not handle opacity
// correctly. Turn it off before bug fixed.
if (maskUsage.opacity != 1.0) {
return false;
}

7
layout/svg/nsSVGIntegrationUtils.cpp
View File

@ -815,9 +815,10 @@ nsSVGIntegrationUtils::PaintMask(const PaintFramesParams& aParams)
SetupContextMatrix(frame, aParams, offsetToBoundingBox,
offsetToUserSpace, false);
nsTArray<nsSVGMaskFrame *> maskFrames = effectProperties.GetMaskFrames();
bool opacityApplied = !HasNonSVGMask(maskFrames);
result = PaintMaskSurface(aParams, maskTarget,
opacityApplied ? maskUsage.opacity : 1.0,
// XXX Bug 1323912.
MOZ_ASSERT(maskUsage.opacity == 1.0,
"nsSVGIntegrationUtils::PaintMask can not handle opacity now.");
result = PaintMaskSurface(aParams, maskTarget, 1.0,
firstFrame->StyleContext(), maskFrames,
ctx.CurrentMatrix(), offsetToUserSpace);
if (result != DrawResult::SUCCESS) {