diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-04-03 17:33:37 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-04-03 17:33:37 -0400 |
| commit | 015f385ecb39218830fc6f9e1fb81e34e1c21901 (patch) | |
| tree | 48669bc7c42bb6520eec152780a96459e691a9b1 /layout | |
| parent | ce3979c721ba378a448bfbe3671c99d993cbc801 (diff) | |
| parent | a04fdfd890ca64988b4fd43a30c284cb994e7ddc (diff) | |
| download | UXP-015f385ecb39218830fc6f9e1fb81e34e1c21901.tar UXP-015f385ecb39218830fc6f9e1fb81e34e1c21901.tar.gz UXP-015f385ecb39218830fc6f9e1fb81e34e1c21901.tar.lz UXP-015f385ecb39218830fc6f9e1fb81e34e1c21901.tar.xz UXP-015f385ecb39218830fc6f9e1fb81e34e1c21901.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/svg/nsSVGMaskFrame.cpp | 3 | ||||
| -rw-r--r-- | layout/svg/nsSVGUtils.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/layout/svg/nsSVGMaskFrame.cpp b/layout/svg/nsSVGMaskFrame.cpp index b8e4b32ae..a22833d61 100644 --- a/layout/svg/nsSVGMaskFrame.cpp +++ b/layout/svg/nsSVGMaskFrame.cpp @@ -274,7 +274,8 @@ nsSVGMaskFrame::GetMaskForMaskedFrame(gfxContext* aContext, } RefPtr<DataSourceSurface> maskSurface = maskSnapshot->GetDataSurface(); DataSourceSurface::MappedSurface map; - if (!maskSurface->Map(DataSourceSurface::MapType::READ, &map)) { + if (!maskSurface || + !maskSurface->Map(DataSourceSurface::MapType::READ, &map)) { return nullptr; } diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp index 0bded21ff..b8794a05d 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) { + if (!isOK || !maskFrame) { // Some resource is invalid. We shouldn't paint anything. return DrawResult::SUCCESS; } |