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

Unified Diff: sky/engine/core/rendering/RenderLayer.cpp

Issue 893093002: Delete remaining masks dead code. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/rendering/RenderLayer.h ('k') | sky/engine/core/rendering/RenderObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/rendering/RenderLayer.cpp
diff --git a/sky/engine/core/rendering/RenderLayer.cpp b/sky/engine/core/rendering/RenderLayer.cpp
index 6e4d5ea5020111cb222aff67bca13d95bc23b24e..2d8f89dd7b1f115563b6afd961843534682b7414 100644
--- a/sky/engine/core/rendering/RenderLayer.cpp
+++ b/sky/engine/core/rendering/RenderLayer.cpp
@@ -474,14 +474,10 @@ static LayoutRect transparencyClipBox(const RenderLayer*, const RenderLayer* roo
static void expandClipRectForDescendantsAndReflection(LayoutRect& clipRect, const RenderLayer* layer, const RenderLayer* rootLayer,
TransparencyClipBoxBehavior transparencyBehavior, const LayoutSize& subPixelAccumulation)
{
- // If we have a mask, then the clip is limited to the border box area (and there is
- // no need to examine child layers).
- if (!layer->renderer()->hasMask()) {
- // Note: we don't have to walk z-order lists since transparent elements always establish
- // a stacking container. This means we can just walk the layer tree directly.
- for (RenderLayer* curr = layer->firstChild(); curr; curr = curr->nextSibling())
- clipRect.unite(transparencyClipBox(curr, rootLayer, transparencyBehavior, DescendantsOfTransparencyClipBox, subPixelAccumulation));
- }
+ // Note: we don't have to walk z-order lists since transparent elements always establish
+ // a stacking container. This means we can just walk the layer tree directly.
+ for (RenderLayer* curr = layer->firstChild(); curr; curr = curr->nextSibling())
+ clipRect.unite(transparencyClipBox(curr, rootLayer, transparencyBehavior, DescendantsOfTransparencyClipBox, subPixelAccumulation));
}
static LayoutRect transparencyClipBox(const RenderLayer* layer, const RenderLayer* rootLayer, TransparencyClipBoxBehavior transparencyBehavior,
@@ -1580,7 +1576,7 @@ bool RenderLayer::isVisuallyNonEmpty() const
if (hasNonEmptyChildRenderers())
return true;
- if (renderer()->isReplaced() || renderer()->hasMask())
+ if (renderer()->isReplaced())
return true;
if (hasVisibleBoxDecorations())
« no previous file with comments | « sky/engine/core/rendering/RenderLayer.h ('k') | sky/engine/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698