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

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

Issue 478333002: hasDescendantWithBlendMode should not be propagated outside the current stacking context. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 2 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
« no previous file with comments | « Source/core/rendering/RenderLayer.h ('k') | no next file » | 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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 info.hasAncestorWithClipOrOverflowClip = true; 167 info.hasAncestorWithClipOrOverflowClip = true;
168 168
169 if (layer->renderer()->hasClipPath()) 169 if (layer->renderer()->hasClipPath())
170 info.hasAncestorWithClipPath = true; 170 info.hasAncestorWithClipPath = true;
171 171
172 RenderLayer::DescendantDependentCompositingInputs descendantProperties; 172 RenderLayer::DescendantDependentCompositingInputs descendantProperties;
173 for (RenderLayer* child = layer->firstChild(); child; child = child->nextSib ling()) { 173 for (RenderLayer* child = layer->firstChild(); child; child = child->nextSib ling()) {
174 updateRecursive(child, updateType, info); 174 updateRecursive(child, updateType, info);
175 175
176 descendantProperties.hasDescendantWithClipPath |= child->hasDescendantWi thClipPath() || child->renderer()->hasClipPath(); 176 descendantProperties.hasDescendantWithClipPath |= child->hasDescendantWi thClipPath() || child->renderer()->hasClipPath();
177 descendantProperties.hasDescendantWithBlendMode |= child->hasDescendantW ithBlendMode() || child->renderer()->hasBlendMode(); 177 descendantProperties.hasNonIsolatedDescendantWithBlendMode |= (!child->s tackingNode()->isStackingContext() && child->hasNonIsolatedDescendantWithBlendMo de()) || child->renderer()->hasBlendMode();
178 } 178 }
179 179
180 layer->updateDescendantDependentCompositingInputs(descendantProperties); 180 layer->updateDescendantDependentCompositingInputs(descendantProperties);
181 layer->didUpdateCompositingInputs(); 181 layer->didUpdateCompositingInputs();
182 182
183 m_geometryMap.popMappingsToAncestor(layer->parent()); 183 m_geometryMap.popMappingsToAncestor(layer->parent());
184 } 184 }
185 185
186 #if ENABLE(ASSERT) 186 #if ENABLE(ASSERT)
187 187
188 void CompositingInputsUpdater::assertNeedsCompositingInputsUpdateBitsCleared(Ren derLayer* layer) 188 void CompositingInputsUpdater::assertNeedsCompositingInputsUpdateBitsCleared(Ren derLayer* layer)
189 { 189 {
190 ASSERT(!layer->childNeedsCompositingInputsUpdate()); 190 ASSERT(!layer->childNeedsCompositingInputsUpdate());
191 ASSERT(!layer->needsCompositingInputsUpdate()); 191 ASSERT(!layer->needsCompositingInputsUpdate());
192 192
193 for (RenderLayer* child = layer->firstChild(); child; child = child->nextSib ling()) 193 for (RenderLayer* child = layer->firstChild(); child; child = child->nextSib ling())
194 assertNeedsCompositingInputsUpdateBitsCleared(child); 194 assertNeedsCompositingInputsUpdateBitsCleared(child);
195 } 195 }
196 196
197 #endif 197 #endif
198 198
199 } // namespace blink 199 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderLayer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698