| Index: third_party/WebKit/Source/core/layout/compositing/CompositingLayerAssigner.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositingLayerAssigner.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositingLayerAssigner.cpp
|
| index 87354d5a28e2e91c6e51516913c8b3cb79432a8a..e735a2c3029b8ae080ac6454e6039e2678c28172 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/CompositingLayerAssigner.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/CompositingLayerAssigner.cpp
|
| @@ -125,7 +125,7 @@ CompositingLayerAssigner::getReasonsPreventingSquashing(
|
| if (!squashingState.haveAssignedBackingsToEntireSquashingLayerSubtree)
|
| return SquashingDisallowedReasonWouldBreakPaintOrder;
|
|
|
| - ASSERT(squashingState.hasMostRecentMapping);
|
| + DCHECK(squashingState.hasMostRecentMapping);
|
| const PaintLayer& squashingLayer =
|
| squashingState.mostRecentMapping->owningLayer();
|
|
|
| @@ -192,7 +192,7 @@ CompositingLayerAssigner::getReasonsPreventingSquashing(
|
| if (layer->nearestFixedPositionLayer() !=
|
| squashingLayer.nearestFixedPositionLayer())
|
| return SquashingDisallowedReasonNearestFixedPositionMismatch;
|
| - ASSERT(layer->layoutObject()->style()->position() != FixedPosition);
|
| + DCHECK(layer->layoutObject()->style()->position() != EPosition::kFixed);
|
|
|
| if ((squashingLayer.layoutObject()->style()->subtreeWillChangeContents() &&
|
| squashingLayer.layoutObject()
|
| @@ -224,8 +224,8 @@ void CompositingLayerAssigner::updateSquashingAssignment(
|
| if (compositedLayerUpdate == PutInSquashingLayer) {
|
| // A layer that is squashed with other layers cannot have its own
|
| // CompositedLayerMapping.
|
| - ASSERT(!layer->hasCompositedLayerMapping());
|
| - ASSERT(squashingState.hasMostRecentMapping);
|
| + DCHECK(!layer->hasCompositedLayerMapping());
|
| + DCHECK(squashingState.hasMostRecentMapping);
|
|
|
| bool changedSquashingLayer =
|
| squashingState.mostRecentMapping->updateSquashingLayerAssignment(
|
| @@ -332,7 +332,7 @@ void CompositingLayerAssigner::assignLayersToBackingsInternal(
|
| // At this point, if the layer is to be separately composited, then its
|
| // backing becomes the most recent in paint-order.
|
| if (layer->compositingState() == PaintsIntoOwnBacking) {
|
| - ASSERT(!requiresSquashing(layer->getCompositingReasons()));
|
| + DCHECK(!requiresSquashing(layer->getCompositingReasons()));
|
| squashingState.updateSquashingStateForNewMapping(
|
| layer->compositedLayerMapping(), layer->hasCompositedLayerMapping(),
|
| layersNeedingPaintInvalidation);
|
|
|