summaryrefslogtreecommitdiffstats
path: root/layout/svg/nsSVGUtils.cpp
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-04-08 18:56:39 -0400
committerMatt A. Tobin <email@mattatobin.com>2019-04-08 18:56:39 -0400
commit6968a3e4021dbd241c0193b47e8abf49c9281506 (patch)
treecd608537c0787f280f8600beb2399ad0de94668d /layout/svg/nsSVGUtils.cpp
parent015f385ecb39218830fc6f9e1fb81e34e1c21901 (diff)
parent964c9830fa956249e5f3f3e30bf5d2d307ca3572 (diff)
downloadUXP-6968a3e4021dbd241c0193b47e8abf49c9281506.tar
UXP-6968a3e4021dbd241c0193b47e8abf49c9281506.tar.gz
UXP-6968a3e4021dbd241c0193b47e8abf49c9281506.tar.lz
UXP-6968a3e4021dbd241c0193b47e8abf49c9281506.tar.xz
UXP-6968a3e4021dbd241c0193b47e8abf49c9281506.zip
Merge branch 'master' into Sync-weave
Diffstat (limited to 'layout/svg/nsSVGUtils.cpp')
-rw-r--r--layout/svg/nsSVGUtils.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp
index b8794a05d..98e5f9b5f 100644
--- a/layout/svg/nsSVGUtils.cpp
+++ b/layout/svg/nsSVGUtils.cpp
@@ -685,7 +685,7 @@ nsSVGUtils::PaintFrameWithEffects(nsIFrame *aFrame,
bool isOK = effectProperties.HasNoFilterOrHasValidFilter();
nsSVGClipPathFrame *clipPathFrame = effectProperties.GetClipPathFrame(&isOK);
nsSVGMaskFrame *maskFrame = effectProperties.GetFirstMaskFrame(&isOK);
- if (!isOK || !maskFrame) {
+ if (!isOK) {
// Some resource is invalid. We shouldn't paint anything.
return DrawResult::SUCCESS;
}
@@ -734,9 +734,12 @@ nsSVGUtils::PaintFrameWithEffects(nsIFrame *aFrame,
RefPtr<SourceSurface> maskSurface;
if (maskUsage.shouldGenerateMaskLayer) {
- maskSurface =
- maskFrame->GetMaskForMaskedFrame(&aContext, aFrame, aTransform,
- maskUsage.opacity, &maskTransform);
+ // Make sure we have a mask frame.
+ if (maskFrame) {
+ maskSurface =
+ maskFrame->GetMaskForMaskedFrame(&aContext, aFrame, aTransform,
+ maskUsage.opacity, &maskTransform);
+ }
if (!maskSurface) {
// Entire surface is clipped out.