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

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

Issue 313053008: Remove some code now that forceCompositingMode is gone. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | « no previous file | 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 e5223288835441e405264afd26c839289363d62d..3a447eaffe0486869d96eef592a887b07085dfc1 100644
--- a/Source/core/rendering/compositing/RenderLayerCompositor.cpp
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
@@ -227,10 +227,7 @@ bool RenderLayerCompositor::acceleratedCompositingForOverflowScrollEnabled() con
void RenderLayerCompositor::setCompositingLayersNeedRebuild()
{
// FIXME: crbug.com/332248 ideally this could be merged with setNeedsCompositingUpdate().
- // FIXME: We can remove the staleInCompositingMode check once we get rid of the
- // forceCompositingMode setting.
- if (staleInCompositingMode())
ojan 2014/06/05 03:32:21 Honestly, I can't remember why this was blocked on
- m_compositingLayersNeedRebuild = true;
+ m_compositingLayersNeedRebuild = true;
page()->animator().scheduleVisualUpdate();
lifecycle().ensureStateAtMost(DocumentLifecycle::LayoutClean);
}
@@ -471,13 +468,7 @@ bool RenderLayerCompositor::allocateOrClearCompositedLayerMapping(RenderLayer* l
switch (compositedLayerUpdate) {
case AllocateOwnCompositedLayerMapping:
ASSERT(!layer->hasCompositedLayerMapping());
- {
- // FIXME: This can go away once we get rid of the forceCompositingMode setting.
- // It's needed because setCompositingModeEnabled call ensureRootLayer, which
- // eventually calls WebViewImpl::enterForceCompositingMode.
- DeprecatedDirtyCompositingDuringCompositingUpdate marker(lifecycle());
- setCompositingModeEnabled(true);
- }
+ setCompositingModeEnabled(true);
// If this layer was previously squashed, we need to remove its reference to a groupedMapping right away, so
// that computing repaint rects will know the layer's correct compositingState.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698