Index: Source/core/rendering/compositing/GraphicsLayerUpdater.cpp |
diff --git a/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp b/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp |
index c27f6d0a28d91e94397ef718b1de47c3bcd8ac43..9d44784f1e4a8416c8429f5ee81003c09baed5e9 100644 |
--- a/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp |
+++ b/Source/core/rendering/compositing/GraphicsLayerUpdater.cpp |
@@ -38,7 +38,7 @@ |
namespace WebCore { |
-bool shouldAppendLayer(const RenderLayer& layer) |
+static bool shouldAppendLayer(const RenderLayer& layer) |
{ |
if (!RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()) |
return true; |
@@ -48,10 +48,7 @@ bool shouldAppendLayer(const RenderLayer& layer) |
return true; |
} |
-GraphicsLayerUpdater::GraphicsLayerUpdater(RenderView& renderView) |
- : m_renderView(renderView) |
- , m_pixelsWithoutPromotingAllTransitions(0.0) |
- , m_pixelsAddedByPromotingAllTransitions(0.0) |
+GraphicsLayerUpdater::GraphicsLayerUpdater() |
{ |
} |
@@ -59,7 +56,7 @@ GraphicsLayerUpdater::~GraphicsLayerUpdater() |
{ |
} |
-void GraphicsLayerUpdater::rebuildTree(RenderLayer& layer, UpdateType updateType, GraphicsLayerVector& childLayersOfEnclosingLayer, int depth) |
+void GraphicsLayerUpdater::rebuildTree(RenderLayer& layer, UpdateType updateType, GraphicsLayerVector& childLayersOfEnclosingLayer) |
{ |
// Make the layer compositing if necessary, and set up clipping and content layers. |
// Note that we can only do work here that is independent of whether the descendant layers |
@@ -73,16 +70,6 @@ void GraphicsLayerUpdater::rebuildTree(RenderLayer& layer, UpdateType updateType |
updateType = update(layer, updateType); |
- // Grab some stats for histograms. |
- if (hasCompositedLayerMapping) { |
- m_pixelsWithoutPromotingAllTransitions += layer.size().height() * layer.size().width(); |
- } else { |
- if ((layer.renderer()->style()->transitionForProperty(CSSPropertyOpacity) || |
- layer.renderer()->style()->transitionForProperty(CSSPropertyWebkitTransform)) && |
- m_renderView.viewRect().intersects(layer.absoluteBoundingBox())) |
- m_pixelsAddedByPromotingAllTransitions += layer.size().height() * layer.size().width(); |
- } |
- |
// If this layer has a compositedLayerMapping, then that is where we place subsequent children GraphicsLayers. |
// Otherwise children continue to append to the child list of the enclosing layer. |
GraphicsLayerVector layerChildren; |
@@ -95,7 +82,7 @@ void GraphicsLayerUpdater::rebuildTree(RenderLayer& layer, UpdateType updateType |
if (layer.stackingNode()->isStackingContainer()) { |
RenderLayerStackingNodeIterator iterator(*layer.stackingNode(), NegativeZOrderChildren); |
while (RenderLayerStackingNode* curNode = iterator.next()) |
- rebuildTree(*curNode->layer(), updateType, childList, depth + 1); |
+ rebuildTree(*curNode->layer(), updateType, childList); |
// If a negative z-order child is compositing, we get a foreground layer which needs to get parented. |
if (hasCompositedLayerMapping && currentCompositedLayerMapping->foregroundLayer()) |
@@ -104,7 +91,7 @@ void GraphicsLayerUpdater::rebuildTree(RenderLayer& layer, UpdateType updateType |
RenderLayerStackingNodeIterator iterator(*layer.stackingNode(), NormalFlowChildren | PositiveZOrderChildren); |
while (RenderLayerStackingNode* curNode = iterator.next()) |
- rebuildTree(*curNode->layer(), updateType, childList, depth + 1); |
+ rebuildTree(*curNode->layer(), updateType, childList); |
if (hasCompositedLayerMapping) { |
bool parented = false; |
@@ -136,11 +123,6 @@ void GraphicsLayerUpdater::rebuildTree(RenderLayer& layer, UpdateType updateType |
if (shouldAppendLayer(layer)) |
childLayersOfEnclosingLayer.append(currentCompositedLayerMapping->childForSuperlayers()); |
} |
- |
- if (!depth) { |
- int percentageIncreaseInPixels = static_cast<int>(m_pixelsAddedByPromotingAllTransitions / m_pixelsWithoutPromotingAllTransitions * 100); |
- blink::Platform::current()->histogramCustomCounts("Renderer.PixelIncreaseFromTransitions", percentageIncreaseInPixels, 0, 1000, 50); |
- } |
} |
// This just updates layer geometry without changing the hierarchy. |