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

Side by Side Diff: Source/core/layout/compositing/CompositingInputsUpdater.cpp

Issue 1176503002: Rename isNormalFlowOnly to something meaningful (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Nittified! Created 5 years, 6 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
« no previous file with comments | « no previous file | Source/core/layout/compositing/GraphicsLayerUpdater.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/layout/compositing/CompositingInputsUpdater.h" 6 #include "core/layout/compositing/CompositingInputsUpdater.h"
7 7
8 #include "core/layout/LayoutBlock.h" 8 #include "core/layout/LayoutBlock.h"
9 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h" 9 #include "core/layout/compositing/CompositedDeprecatedPaintLayerMapping.h"
10 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h" 10 #include "core/layout/compositing/DeprecatedPaintLayerCompositor.h"
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 properties.ancestorScrollingLayer = parentLayerOnContainingBlock Chain->ancestorScrollingLayer(); 137 properties.ancestorScrollingLayer = parentLayerOnContainingBlock Chain->ancestorScrollingLayer();
138 if (parentLayerOnContainingBlockChain->scrollsOverflow()) 138 if (parentLayerOnContainingBlockChain->scrollsOverflow())
139 properties.ancestorScrollingLayer = parentLayerOnContainingB lockChain; 139 properties.ancestorScrollingLayer = parentLayerOnContainingB lockChain;
140 140
141 if (layer->layoutObject()->isOutOfFlowPositioned() && !layer->su btreeIsInvisible()) { 141 if (layer->layoutObject()->isOutOfFlowPositioned() && !layer->su btreeIsInvisible()) {
142 const DeprecatedPaintLayer* clippingLayer = properties.clipp ingContainer ? properties.clippingContainer->enclosingLayer() : layer->composito r()->rootLayer(); 142 const DeprecatedPaintLayer* clippingLayer = properties.clipp ingContainer ? properties.clippingContainer->enclosingLayer() : layer->composito r()->rootLayer();
143 if (hasClippedStackingAncestor(layer, clippingLayer)) 143 if (hasClippedStackingAncestor(layer, clippingLayer))
144 properties.clipParent = clippingLayer; 144 properties.clipParent = clippingLayer;
145 } 145 }
146 146
147 if (!layer->stackingNode()->isNormalFlowOnly() 147 if (layer->stackingNode()->isTreatedAsStackingContextForPainting ()
148 && properties.ancestorScrollingLayer 148 && properties.ancestorScrollingLayer
149 && !info.ancestorStackingContext->layoutObject()->isDescenda ntOf(properties.ancestorScrollingLayer->layoutObject())) 149 && !info.ancestorStackingContext->layoutObject()->isDescenda ntOf(properties.ancestorScrollingLayer->layoutObject()))
150 properties.scrollParent = properties.ancestorScrollingLayer; 150 properties.scrollParent = properties.ancestorScrollingLayer;
151 } 151 }
152 } 152 }
153 153
154 properties.hasAncestorWithClipPath = info.hasAncestorWithClipPath; 154 properties.hasAncestorWithClipPath = info.hasAncestorWithClipPath;
155 layer->updateAncestorDependentCompositingInputs(properties); 155 layer->updateAncestorDependentCompositingInputs(properties);
156 } 156 }
157 157
(...skipping 30 matching lines...) Expand all
188 ASSERT(!layer->childNeedsCompositingInputsUpdate()); 188 ASSERT(!layer->childNeedsCompositingInputsUpdate());
189 ASSERT(!layer->needsCompositingInputsUpdate()); 189 ASSERT(!layer->needsCompositingInputsUpdate());
190 190
191 for (DeprecatedPaintLayer* child = layer->firstChild(); child; child = child ->nextSibling()) 191 for (DeprecatedPaintLayer* child = layer->firstChild(); child; child = child ->nextSibling())
192 assertNeedsCompositingInputsUpdateBitsCleared(child); 192 assertNeedsCompositingInputsUpdateBitsCleared(child);
193 } 193 }
194 194
195 #endif 195 #endif
196 196
197 } // namespace blink 197 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/layout/compositing/GraphicsLayerUpdater.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698