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

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

Issue 686973002: Remove isUnclippedDescendant. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: tests Created 6 years, 1 month 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 | « Source/core/rendering/RenderLayer.h ('k') | Source/core/testing/Internals.h » ('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/rendering/compositing/CompositingInputsUpdater.h" 6 #include "core/rendering/compositing/CompositingInputsUpdater.h"
7 7
8 #include "core/rendering/RenderBlock.h" 8 #include "core/rendering/RenderBlock.h"
9 #include "core/rendering/RenderLayer.h" 9 #include "core/rendering/RenderLayer.h"
10 #include "core/rendering/compositing/CompositedLayerMapping.h" 10 #include "core/rendering/compositing/CompositedLayerMapping.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 132
133 if (info.lastScrollingAncestor) { 133 if (info.lastScrollingAncestor) {
134 const RenderObject* containingBlock = layer->renderer()->contain ingBlock(); 134 const RenderObject* containingBlock = layer->renderer()->contain ingBlock();
135 const RenderLayer* parentLayerOnContainingBlockChain = findParen tLayerOnContainingBlockChain(containingBlock); 135 const RenderLayer* parentLayerOnContainingBlockChain = findParen tLayerOnContainingBlockChain(containingBlock);
136 136
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->renderer()->isOutOfFlowPositioned() && !layer->subtre eIsInvisible()) { 141 if (layer->renderer()->isOutOfFlowPositioned() && !layer->subtre eIsInvisible()) {
142 const RenderObject* lastScroller = info.lastScrollingAncesto r->renderer();
143 const RenderLayer* clippingLayer = properties.clippingContai ner ? properties.clippingContainer->enclosingLayer() : layer->compositor()->root RenderLayer(); 142 const RenderLayer* clippingLayer = properties.clippingContai ner ? properties.clippingContainer->enclosingLayer() : layer->compositor()->root RenderLayer();
144 properties.isUnclippedDescendant = lastScroller != containin gBlock && lastScroller->isDescendantOf(containingBlock);
145 if (hasClippedStackingAncestor(layer, clippingLayer)) 143 if (hasClippedStackingAncestor(layer, clippingLayer))
146 properties.clipParent = clippingLayer; 144 properties.clipParent = clippingLayer;
147 } 145 }
148 146
149 if (!layer->stackingNode()->isNormalFlowOnly() 147 if (!layer->stackingNode()->isNormalFlowOnly()
150 && properties.ancestorScrollingLayer 148 && properties.ancestorScrollingLayer
151 && !info.ancestorStackingContext->renderer()->isDescendantOf (properties.ancestorScrollingLayer->renderer())) 149 && !info.ancestorStackingContext->renderer()->isDescendantOf (properties.ancestorScrollingLayer->renderer()))
152 properties.scrollParent = properties.ancestorScrollingLayer; 150 properties.scrollParent = properties.ancestorScrollingLayer;
153 } 151 }
154 } 152 }
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 ASSERT(!layer->childNeedsCompositingInputsUpdate()); 188 ASSERT(!layer->childNeedsCompositingInputsUpdate());
191 ASSERT(!layer->needsCompositingInputsUpdate()); 189 ASSERT(!layer->needsCompositingInputsUpdate());
192 190
193 for (RenderLayer* child = layer->firstChild(); child; child = child->nextSib ling()) 191 for (RenderLayer* child = layer->firstChild(); child; child = child->nextSib ling())
194 assertNeedsCompositingInputsUpdateBitsCleared(child); 192 assertNeedsCompositingInputsUpdateBitsCleared(child);
195 } 193 }
196 194
197 #endif 195 #endif
198 196
199 } // namespace blink 197 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayer.h ('k') | Source/core/testing/Internals.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698