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

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

Issue 207513002: Compute style-determined compositing reasons during recalc style (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: No longer friends Created 6 years, 9 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/compositing/CompositingReasonFinder.h » ('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 c47be6490ca11ad4b7035a408ddf811fd9988690..bf0ca8532c64ade336c2d1b92f4ed091aa250edd 100644
--- a/Source/core/rendering/RenderLayer.cpp
+++ b/Source/core/rendering/RenderLayer.cpp
@@ -1185,11 +1185,12 @@ RenderLayer* RenderLayer::enclosingFilterLayer(IncludeSelfOrNot includeSelf) con
return 0;
}
-void RenderLayer::setCompositingReasons(CompositingReasons reasons)
+void RenderLayer::setCompositingReasons(CompositingReasons reasons, CompositingReasons mask)
{
- if (m_compositingProperties.compositingReasons == reasons)
+ ASSERT(reasons == (reasons & mask));
+ if ((m_compositingProperties.compositingReasons & mask) == (reasons & mask))
return;
- m_compositingProperties.compositingReasons = reasons;
+ m_compositingProperties.compositingReasons = (reasons & mask) | (m_compositingProperties.compositingReasons & ~mask);
m_clipper.setCompositingClipRectsDirty();
}
@@ -3908,6 +3909,8 @@ void RenderLayer::styleChanged(StyleDifference diff, const RenderStyle* oldStyle
updateFilters(oldStyle, renderer()->style());
}
+ compositor()->updateStyleDeterminedCompositingReasons(this);
+
// FIXME: Remove incremental compositing updates after fixing the chicken/egg issues
// https://code.google.com/p/chromium/issues/detail?id=343756
DisableCompositingQueryAsserts disabler;
« no previous file with comments | « Source/core/rendering/RenderLayer.h ('k') | Source/core/rendering/compositing/CompositingReasonFinder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698