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

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

Issue 26110004: Defer the real work in updateCompositingLayers until it's really needed. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: patch for landing Created 7 years, 2 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/RenderLayerCompositor.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 c0785804562e00218aaad3928ba5cde48310074c..838332b7cc3b8bb8eba92c9af9b5c3ed564bc246 100644
--- a/Source/core/rendering/RenderLayer.cpp
+++ b/Source/core/rendering/RenderLayer.cpp
@@ -702,20 +702,6 @@ void RenderLayer::updateLayerPositionsAfterScroll(RenderGeometryMap* geometryMap
geometryMap->popMappingsToAncestor(parent());
}
-void RenderLayer::positionNewlyCreatedOverflowControls()
-{
- if (!compositedLayerMapping()->hasUnpositionedOverflowControlsLayers())
- return;
-
- RenderGeometryMap geometryMap(UseTransforms);
- RenderView* view = renderer()->view();
- if (this != view->layer() && parent())
- geometryMap.pushMappingsToAncestor(parent(), 0);
-
- LayoutPoint offsetFromRoot = LayoutPoint(geometryMap.absolutePoint(FloatPoint()));
- positionOverflowControls(toIntSize(roundedIntPoint(offsetFromRoot)));
-}
-
bool RenderLayer::hasBlendMode() const
{
return RuntimeEnabledFeatures::cssCompositingEnabled() && renderer()->hasBlendMode();
@@ -2111,7 +2097,7 @@ void RenderLayer::didUpdateNeedsCompositedScrolling()
dirtyStackingContainerZOrderLists();
- compositor()->setShouldReevaluateCompositingAfterLayout();
+ compositor()->setNeedsToRecomputeCompositingRequirements();
compositor()->setCompositingLayersNeedRebuild();
}
@@ -4510,7 +4496,7 @@ void RenderLayer::dirtyZOrderLists()
compositor()->setNeedsUpdateCompositingRequirementsState();
compositor()->setCompositingLayersNeedRebuild();
if (acceleratedCompositingForOverflowScrollEnabled())
- compositor()->setShouldReevaluateCompositingAfterLayout();
+ compositor()->setNeedsToRecomputeCompositingRequirements();
}
}
@@ -4547,7 +4533,7 @@ void RenderLayer::dirtyNormalFlowList()
if (!renderer()->documentBeingDestroyed()) {
compositor()->setCompositingLayersNeedRebuild();
if (acceleratedCompositingForOverflowScrollEnabled())
- compositor()->setShouldReevaluateCompositingAfterLayout();
+ compositor()->setNeedsToRecomputeCompositingRequirements();
}
}
@@ -5272,6 +5258,17 @@ IntRect RenderLayer::scrollCornerAndResizerRect() const
return m_scrollableArea->scrollCornerAndResizerRect();
}
+void RenderLayer::positionOverflowControls()
+{
+ RenderGeometryMap geometryMap(UseTransforms);
+ RenderView* view = renderer()->view();
+ if (this != view->layer() && parent())
+ geometryMap.pushMappingsToAncestor(parent(), 0);
+
+ LayoutPoint offsetFromRoot = LayoutPoint(geometryMap.absolutePoint(FloatPoint()));
+ positionOverflowControls(toIntSize(roundedIntPoint(offsetFromRoot)));
+}
+
void RenderLayer::positionOverflowControls(const IntSize& offsetFromRoot)
{
if (m_scrollableArea)
« no previous file with comments | « Source/core/rendering/RenderLayer.h ('k') | Source/core/rendering/RenderLayerCompositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698