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

Unified Diff: Source/core/rendering/RenderLayer.cpp

Issue 233063004: Suppress layer creation for descendants of GPU-rasterized layers (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Move assert disabler in ~CompositedLayerMapping Created 6 years, 8 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 | « Source/core/rendering/RenderLayer.h ('k') | Source/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderLayer.cpp
diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
index 43d2eba4f4e2a7c3794a14cc28ea2808e89fe030..5daa9b4cf4d2bb3f2cd964dc21548daee4c279a9 100644
--- a/Source/core/rendering/RenderLayer.cpp
+++ b/Source/core/rendering/RenderLayer.cpp
@@ -805,10 +805,10 @@ void RenderLayer::updateScrollingStateAfterCompositingChange()
}
}
- m_compositingProperties.hasNonCompositedChild = false;
+ compositingProperties().hasNonCompositedChild = false;
for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) {
if (child->compositingState() == NotComposited) {
- m_compositingProperties.hasNonCompositedChild = true;
+ compositingProperties().hasNonCompositedChild = true;
return;
}
}
@@ -1203,9 +1203,9 @@ void RenderLayer::clearChildNeedsToUpdateAncestorDependantProperties()
void RenderLayer::setCompositingReasons(CompositingReasons reasons, CompositingReasons mask)
{
ASSERT(reasons == (reasons & mask));
- if ((m_compositingProperties.compositingReasons & mask) == (reasons & mask))
+ if ((compositingProperties().compositingReasons & mask) == (reasons & mask))
return;
- m_compositingProperties.compositingReasons = (reasons & mask) | (m_compositingProperties.compositingReasons & ~mask);
+ compositingProperties().compositingReasons = (reasons & mask) | (compositingProperties().compositingReasons & ~mask);
m_clipper.setCompositingClipRectsDirty();
}
« no previous file with comments | « Source/core/rendering/RenderLayer.h ('k') | Source/core/rendering/RenderLayerScrollableArea.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698