Index: Source/core/rendering/compositing/RenderLayerCompositor.cpp |
diff --git a/Source/core/rendering/compositing/RenderLayerCompositor.cpp b/Source/core/rendering/compositing/RenderLayerCompositor.cpp |
index d4fab7723c1051b906d53c92c08299e1c91fdc01..c7213c4e61d995a7eef7327ae25ba071e0542d0a 100644 |
--- a/Source/core/rendering/compositing/RenderLayerCompositor.cpp |
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.cpp |
@@ -288,15 +288,11 @@ void RenderLayerCompositor::applyOverlayFullscreenVideoAdjustment() |
void RenderLayerCompositor::updateIfNeeded() |
{ |
- CompositingUpdateType updateType = m_pendingUpdateType; |
- m_pendingUpdateType = CompositingUpdateNone; |
- |
- if (!hasAcceleratedCompositing()) |
+ if (!hasAcceleratedCompositing() || m_pendingUpdateType == CompositingUpdateNone) |
return; |
- bool needsToUpdateScrollingCoordinator = scrollingCoordinator() && scrollingCoordinator()->needsToUpdateAfterCompositingChange(); |
- if (updateType == CompositingUpdateNone && !needsToUpdateScrollingCoordinator) |
- return; |
+ CompositingUpdateType updateType = m_pendingUpdateType; |
+ m_pendingUpdateType = CompositingUpdateNone; |
RenderLayer* updateRoot = rootRenderLayer(); |
@@ -366,11 +362,6 @@ void RenderLayerCompositor::updateIfNeeded() |
m_needsUpdateFixedBackground = false; |
} |
- // The scrolling coordinator may realize that it needs updating while compositing was being updated in this function. |
- needsToUpdateScrollingCoordinator |= scrollingCoordinator() && scrollingCoordinator()->needsToUpdateAfterCompositingChange(); |
- if (needsToUpdateScrollingCoordinator && m_renderView.frame()->isMainFrame() && scrollingCoordinator() && inCompositingMode()) |
- scrollingCoordinator()->updateAfterCompositingChange(); |
- |
for (unsigned i = 0; i < layersNeedingRepaint.size(); i++) { |
RenderLayer* layer = layersNeedingRepaint[i]; |
layer->repainter().computeRepaintRectsIncludingNonCompositingDescendants(); |