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

Side by Side Diff: Source/core/rendering/compositing/GraphicsLayerTreeBuilder.cpp

Issue 397733004: Allow assertions to be enabled in Blink Release builds. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed config.gni. Minor cleanups. Created 6 years, 5 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 | Annotate | Revision Log
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 // If this layer has a compositedLayerMapping, then that is where we place s ubsequent children GraphicsLayers. 69 // If this layer has a compositedLayerMapping, then that is where we place s ubsequent children GraphicsLayers.
70 // Otherwise children continue to append to the child list of the enclosing layer. 70 // Otherwise children continue to append to the child list of the enclosing layer.
71 GraphicsLayerVector layerChildren; 71 GraphicsLayerVector layerChildren;
72 AncestorInfo infoForChildren(info); 72 AncestorInfo infoForChildren(info);
73 if (hasCompositedLayerMapping) { 73 if (hasCompositedLayerMapping) {
74 infoForChildren.childLayersOfEnclosingCompositedLayer = &layerChildren; 74 infoForChildren.childLayersOfEnclosingCompositedLayer = &layerChildren;
75 infoForChildren.enclosingCompositedLayer = &layer; 75 infoForChildren.enclosingCompositedLayer = &layer;
76 } 76 }
77 77
78 #if ASSERT_ENABLED 78 #if ENABLE(ASSERT)
79 LayerListMutationDetector mutationChecker(layer.stackingNode()); 79 LayerListMutationDetector mutationChecker(layer.stackingNode());
80 #endif 80 #endif
81 81
82 if (layer.stackingNode()->isStackingContext()) { 82 if (layer.stackingNode()->isStackingContext()) {
83 RenderLayerStackingNodeIterator iterator(*layer.stackingNode(), Negative ZOrderChildren); 83 RenderLayerStackingNodeIterator iterator(*layer.stackingNode(), Negative ZOrderChildren);
84 while (RenderLayerStackingNode* curNode = iterator.next()) 84 while (RenderLayerStackingNode* curNode = iterator.next())
85 rebuild(*curNode->layer(), infoForChildren); 85 rebuild(*curNode->layer(), infoForChildren);
86 86
87 // If a negative z-order child is compositing, we get a foreground layer which needs to get parented. 87 // If a negative z-order child is compositing, we get a foreground layer which needs to get parented.
88 if (hasCompositedLayerMapping && currentCompositedLayerMapping->foregrou ndLayer()) 88 if (hasCompositedLayerMapping && currentCompositedLayerMapping->foregrou ndLayer())
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 } 126 }
127 127
128 if (layer.scrollParent() 128 if (layer.scrollParent()
129 && layer.scrollParent()->hasCompositedLayerMapping() 129 && layer.scrollParent()->hasCompositedLayerMapping()
130 && layer.scrollParent()->scrollableArea()->hasOverlayScrollbars() 130 && layer.scrollParent()->scrollableArea()->hasOverlayScrollbars()
131 && layer.scrollParent()->scrollableArea()->topmostScrollChild() == &laye r) 131 && layer.scrollParent()->scrollableArea()->topmostScrollChild() == &laye r)
132 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()- >compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi tedLayer)); 132 info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()- >compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingComposi tedLayer));
133 } 133 }
134 134
135 } 135 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698