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

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

Issue 330513002: Disentangle updating the ScrollingCoordinator from RenderLayerCompositor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix assert Created 6 years, 6 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/page/scrolling/ScrollingCoordinator.cpp ('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 81603f801f981f1f2d05c5322fefc8b5cb3b13c7..ecca030df1fc245c299fd86c1f2ed1eaa948560d 100644
--- a/Source/core/rendering/compositing/RenderLayerCompositor.cpp
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
@@ -291,11 +291,7 @@ void RenderLayerCompositor::updateIfNeeded()
CompositingUpdateType updateType = m_pendingUpdateType;
m_pendingUpdateType = CompositingUpdateNone;
- if (!hasAcceleratedCompositing())
- return;
-
- bool needsToUpdateScrollingCoordinator = scrollingCoordinator() && scrollingCoordinator()->needsToUpdateAfterCompositingChange();
- if (updateType == CompositingUpdateNone && !needsToUpdateScrollingCoordinator)
+ if (!hasAcceleratedCompositing() || updateType == CompositingUpdateNone)
return;
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();
« no previous file with comments | « Source/core/page/scrolling/ScrollingCoordinator.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698