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

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

Issue 2640163004: Replace ENABLE(ASSERT) with DCHECK_IS_ON(). (Closed)
Patch Set: Created 3 years, 11 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 // If this layer has a compositedLayerMapping, then that is where we place 64 // If this layer has a compositedLayerMapping, then that is where we place
65 // subsequent children GraphicsLayers. Otherwise children continue to append 65 // subsequent children GraphicsLayers. Otherwise children continue to append
66 // to the child list of the enclosing layer. 66 // to the child list of the enclosing layer.
67 GraphicsLayerVector layerChildren; 67 GraphicsLayerVector layerChildren;
68 AncestorInfo infoForChildren(info); 68 AncestorInfo infoForChildren(info);
69 if (hasCompositedLayerMapping) { 69 if (hasCompositedLayerMapping) {
70 infoForChildren.childLayersOfEnclosingCompositedLayer = &layerChildren; 70 infoForChildren.childLayersOfEnclosingCompositedLayer = &layerChildren;
71 infoForChildren.enclosingCompositedLayer = &layer; 71 infoForChildren.enclosingCompositedLayer = &layer;
72 } 72 }
73 73
74 #if ENABLE(ASSERT) 74 #if DCHECK_IS_ON()
75 LayerListMutationDetector mutationChecker(layer.stackingNode()); 75 LayerListMutationDetector mutationChecker(layer.stackingNode());
76 #endif 76 #endif
77 77
78 if (layer.stackingNode()->isStackingContext()) { 78 if (layer.stackingNode()->isStackingContext()) {
79 PaintLayerStackingNodeIterator iterator(*layer.stackingNode(), 79 PaintLayerStackingNodeIterator iterator(*layer.stackingNode(),
80 NegativeZOrderChildren); 80 NegativeZOrderChildren);
81 while (PaintLayerStackingNode* curNode = iterator.next()) 81 while (PaintLayerStackingNode* curNode = iterator.next())
82 rebuild(*curNode->layer(), infoForChildren); 82 rebuild(*curNode->layer(), infoForChildren);
83 83
84 // If a negative z-order child is compositing, we get a foreground layer 84 // If a negative z-order child is compositing, we get a foreground layer
(...skipping 29 matching lines...) Expand all
114 ->compositedLayerMapping() 114 ->compositedLayerMapping()
115 ->needsToReparentOverflowControls() && 115 ->needsToReparentOverflowControls() &&
116 layer.scrollParent()->getScrollableArea()->topmostScrollChild() == &layer) 116 layer.scrollParent()->getScrollableArea()->topmostScrollChild() == &layer)
117 info.childLayersOfEnclosingCompositedLayer->push_back( 117 info.childLayersOfEnclosingCompositedLayer->push_back(
118 layer.scrollParent() 118 layer.scrollParent()
119 ->compositedLayerMapping() 119 ->compositedLayerMapping()
120 ->detachLayerForOverflowControls(*info.enclosingCompositedLayer)); 120 ->detachLayerForOverflowControls(*info.enclosingCompositedLayer));
121 } 121 }
122 122
123 } // namespace blink 123 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698