Commit dda7ecce authored by Bob Owen's avatar Bob Owen
Browse files

Bug 1850180: Release assert on too many PopLayers in DrawTargetSkia and... 

Bug 1850180: Release assert on too many PopLayers in DrawTargetSkia and DrawTargetCairo. r=jrmuizel a=pascalc

Differential Revision: https://phabricator.services.mozilla.com/D187470
parent b0626f19

gfx/2d/DrawTargetCairo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1647,7 +1647,7 @@ void DrawTargetCairo::PushLayerWithBlend(bool aOpaque, Float aOpacity, 
}



void DrawTargetCairo::PopLayer() {

  MOZ_ASSERT(!mPushedLayers.empty());

  MOZ_RELEASE_ASSERT(!mPushedLayers.empty());



  cairo_set_operator(mContext, CAIRO_OPERATOR_OVER);

gfx/2d/DrawTargetSkia.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1997,9 +1997,10 @@ void DrawTargetSkia::PushLayerWithBlend(bool aOpaque, Float aOpacity, 
}



void DrawTargetSkia::PopLayer() {

  MOZ_RELEASE_ASSERT(!mPushedLayers.empty());



  MarkChanged();



  MOZ_ASSERT(!mPushedLayers.empty());

  const PushedLayer& layer = mPushedLayers.back();



  mCanvas->restore();