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

Unified Diff: Source/core/rendering/compositing/RenderLayerCompositor.cpp

Issue 466193002: Disentangle blend mode from updateDescendantDependentFlags (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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/compositing/RenderLayerCompositor.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/compositing/RenderLayerCompositor.cpp
diff --git a/Source/core/rendering/compositing/RenderLayerCompositor.cpp b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
index 272e670619223771a70ec8182ce722c63e6510bd..fd4e641f1caef7778e49f726263d40e306c50b79 100644
--- a/Source/core/rendering/compositing/RenderLayerCompositor.cpp
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
@@ -284,12 +284,29 @@ void RenderLayerCompositor::applyOverlayFullscreenVideoAdjustment()
m_inOverlayFullscreenVideo = true;
}
+void RenderLayerCompositor::updateWithoutAcceleratedCompositing(CompositingUpdateType updateType)
+{
+ ASSERT(!hasAcceleratedCompositing());
+
+ if (updateType >= CompositingUpdateAfterCompositingInputChange)
+ CompositingInputsUpdater(rootRenderLayer()).update();
+
+#if ENABLE(ASSERT)
+ CompositingInputsUpdater::assertNeedsCompositingInputsUpdateBitsCleared(rootRenderLayer());
+#endif
+}
+
void RenderLayerCompositor::updateIfNeeded()
{
CompositingUpdateType updateType = m_pendingUpdateType;
m_pendingUpdateType = CompositingUpdateNone;
- if (!hasAcceleratedCompositing() || updateType == CompositingUpdateNone)
+ if (!hasAcceleratedCompositing()) {
+ updateWithoutAcceleratedCompositing(updateType);
+ return;
+ }
+
+ if (updateType == CompositingUpdateNone)
return;
RenderLayer* updateRoot = rootRenderLayer();
« no previous file with comments | « Source/core/rendering/compositing/RenderLayerCompositor.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698