Bug 1292395 - Tweak this assertion message. r?mattwoodrow draft
authorMarkus Stange <mstange@themasta.com>
Thu, 04 Aug 2016 22:00:04 -0400
changeset 397000 fd23566e64b5c071abd2e2d0c2fa68475f56e46d
parent 396804 0ba72e8027cfcbcbf3426770ac264a7ade2af090
child 397021 fe1e02dada23630129dfb6a644173abc3cbb2ab3
push id25174
push usermstange@themasta.com
push dateFri, 05 Aug 2016 02:06:16 +0000
reviewersmattwoodrow
bugs1292395
milestone51.0a1
Bug 1292395 - Tweak this assertion message. r?mattwoodrow DONTBUILD MozReview-Commit-ID: AARqrxI1Qwn
layout/base/FrameLayerBuilder.cpp
--- a/layout/base/FrameLayerBuilder.cpp
+++ b/layout/base/FrameLayerBuilder.cpp
@@ -4701,17 +4701,17 @@ FrameLayerBuilder::CheckInLayerTreeCompr
 }
 
 void
 ContainerState::CollectOldLayers()
 {
   for (Layer* layer = mContainerLayer->GetFirstChild(); layer;
        layer = layer->GetNextSibling()) {
     NS_ASSERTION(!layer->HasUserData(&gMaskLayerUserData),
-                 "Mask layer in layer tree; could not be recycled.");
+                 "Mask layers should not be part of the layer tree.");
     if (layer->HasUserData(&gPaintedDisplayItemLayerUserData)) {
       NS_ASSERTION(layer->AsPaintedLayer(), "Wrong layer type");
       mPaintedLayersAvailableForRecycling.PutEntry(static_cast<PaintedLayer*>(layer));
     }
 
     if (Layer* maskLayer = layer->GetMaskLayer()) {
       NS_ASSERTION(maskLayer->GetType() == Layer::TYPE_IMAGE,
                    "Could not recycle mask layer, unsupported layer type.");