Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Side by Side Diff: third_party/WebKit/Source/core/layout/compositing/CompositingLayerAssigner.cpp

Issue 2770203002: Replace DCHECK with DCHECK_op and split some DCHECKs wherever necessary (Closed)
Patch Set: Add few more Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
3 * Copyright (C) 2014 Google Inc. All rights reserved. 3 * Copyright (C) 2014 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 if (layer->renderingContextRoot() != squashingLayer.renderingContextRoot()) 185 if (layer->renderingContextRoot() != squashingLayer.renderingContextRoot())
186 return SquashingDisallowedReasonRenderingContextMismatch; 186 return SquashingDisallowedReasonRenderingContextMismatch;
187 187
188 if (layer->hasFilterInducingProperty() || 188 if (layer->hasFilterInducingProperty() ||
189 layer->filterAncestor() != squashingLayer.filterAncestor()) 189 layer->filterAncestor() != squashingLayer.filterAncestor())
190 return SquashingDisallowedReasonFilterMismatch; 190 return SquashingDisallowedReasonFilterMismatch;
191 191
192 if (layer->nearestFixedPositionLayer() != 192 if (layer->nearestFixedPositionLayer() !=
193 squashingLayer.nearestFixedPositionLayer()) 193 squashingLayer.nearestFixedPositionLayer())
194 return SquashingDisallowedReasonNearestFixedPositionMismatch; 194 return SquashingDisallowedReasonNearestFixedPositionMismatch;
195 DCHECK(layer->layoutObject().style()->position() != EPosition::kFixed); 195 DCHECK_NE(layer->layoutObject().style()->position(), EPosition::kFixed);
196 196
197 if ((squashingLayer.layoutObject().style()->subtreeWillChangeContents() && 197 if ((squashingLayer.layoutObject().style()->subtreeWillChangeContents() &&
198 squashingLayer.layoutObject() 198 squashingLayer.layoutObject()
199 .style() 199 .style()
200 ->isRunningAnimationOnCompositor()) || 200 ->isRunningAnimationOnCompositor()) ||
201 squashingLayer.layoutObject() 201 squashingLayer.layoutObject()
202 .style() 202 .style()
203 ->shouldCompositeForCurrentAnimations()) 203 ->shouldCompositeForCurrentAnimations())
204 return SquashingDisallowedReasonSquashingLayerIsAnimating; 204 return SquashingDisallowedReasonSquashingLayerIsAnimating;
205 205
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 while (PaintLayerStackingNode* curNode = iterator.next()) 350 while (PaintLayerStackingNode* curNode = iterator.next())
351 assignLayersToBackingsInternal(curNode->layer(), squashingState, 351 assignLayersToBackingsInternal(curNode->layer(), squashingState,
352 layersNeedingPaintInvalidation); 352 layersNeedingPaintInvalidation);
353 353
354 if (squashingState.hasMostRecentMapping && 354 if (squashingState.hasMostRecentMapping &&
355 &squashingState.mostRecentMapping->owningLayer() == layer) 355 &squashingState.mostRecentMapping->owningLayer() == layer)
356 squashingState.haveAssignedBackingsToEntireSquashingLayerSubtree = true; 356 squashingState.haveAssignedBackingsToEntireSquashingLayerSubtree = true;
357 } 357 }
358 358
359 } // namespace blink 359 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698