Commit 54497d0b authored by pdr@chromium.org's avatar pdr@chromium.org

Shrink RenderLayerCompositor by 5% by removing unused code

Remove has3DContent, layerHas3DContent
The last vestiges of these functions were removed with
https://src.chromium.org/viewvc/blink?revision=167695&view=revision
when Abarth removed isSoftwareRenderable.

Remove computeFixedViewportConstraints, computeStickyViewportConstraints
Jamesr removed the last callers in
https://src.chromium.org/viewvc/blink?view=rev&revision=147653

Remove clearMappingForAllRenderLayers, clearMappingForRenderLayerIncludingDescendants
These functions were added (under a different name) by Simon Fraser in
http://trac.webkit.org/changeset/90484. Jamesr removed the caller
in https://codereview.chromium.org/13818029.

Remove setCompositingParent, removeCompositedChildren
This code predates written history and possibly humankind.

Remove updateLayerTreeGeometry
Abarth removed the implementation but left the function definition in
https://src.chromium.org/viewvc/blink?view=rev&revision=168244

Remove updateGraphicsLayersMappedToRenderLayer
Abarth removed the implementation but left the function definition in
https://src.chromium.org/viewvc/blink?view=rev&revision=167697

Remove hasAnyAdditionalCompositedLayers
Shawn Singh removed the implementation but left the function definition
in https://src.chromium.org/viewvc/blink?view=rev&revision=163720

Review URL: https://codereview.chromium.org/209703002

git-svn-id: svn://svn.chromium.org/blink/trunk@169866 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent d8f431db
...@@ -1572,25 +1572,6 @@ void RenderLayerCompositor::setIsInWindow(bool isInWindow) ...@@ -1572,25 +1572,6 @@ void RenderLayerCompositor::setIsInWindow(bool isInWindow)
} }
} }
void RenderLayerCompositor::clearMappingForRenderLayerIncludingDescendants(RenderLayer* layer)
{
if (!layer)
return;
if (layer->hasCompositedLayerMapping()) {
removeViewportConstrainedLayer(layer);
layer->clearCompositedLayerMapping();
}
for (RenderLayer* currLayer = layer->firstChild(); currLayer; currLayer = currLayer->nextSibling())
clearMappingForRenderLayerIncludingDescendants(currLayer);
}
void RenderLayerCompositor::clearMappingForAllRenderLayers()
{
clearMappingForRenderLayerIncludingDescendants(m_renderView.layer());
}
void RenderLayerCompositor::updateRootLayerPosition() void RenderLayerCompositor::updateRootLayerPosition()
{ {
if (m_rootContentLayer) { if (m_rootContentLayer) {
...@@ -1608,11 +1589,6 @@ void RenderLayerCompositor::updateRootLayerPosition() ...@@ -1608,11 +1589,6 @@ void RenderLayerCompositor::updateRootLayerPosition()
} }
} }
bool RenderLayerCompositor::has3DContent() const
{
return layerHas3DContent(rootRenderLayer());
}
void RenderLayerCompositor::updateStyleDeterminedCompositingReasons(RenderLayer* layer) void RenderLayerCompositor::updateStyleDeterminedCompositingReasons(RenderLayer* layer)
{ {
CompositingReasons reasons = m_compositingReasonFinder.styleDeterminedReasons(layer->renderer()); CompositingReasons reasons = m_compositingReasonFinder.styleDeterminedReasons(layer->renderer());
...@@ -2150,32 +2126,6 @@ void RenderLayerCompositor::notifyIFramesOfCompositingChange() ...@@ -2150,32 +2126,6 @@ void RenderLayerCompositor::notifyIFramesOfCompositingChange()
} }
} }
bool RenderLayerCompositor::layerHas3DContent(const RenderLayer* layer) const
{
const RenderStyle* style = layer->renderer()->style();
RenderLayerStackingNode* stackingNode = const_cast<RenderLayer*>(layer)->stackingNode();
if (style &&
(style->transformStyle3D() == TransformStyle3DPreserve3D ||
style->hasPerspective() ||
style->transform().has3DOperation()))
return true;
stackingNode->updateLayerListsIfNeeded();
#if !ASSERT_DISABLED
LayerListMutationDetector mutationChecker(stackingNode);
#endif
RenderLayerStackingNodeIterator iterator(*layer->stackingNode(), AllChildren);
while (RenderLayerStackingNode* curNode = iterator.next()) {
if (layerHas3DContent(curNode->layer()))
return true;
}
return false;
}
void RenderLayerCompositor::updateViewportConstraintStatus(RenderLayer* layer) void RenderLayerCompositor::updateViewportConstraintStatus(RenderLayer* layer)
{ {
if (CompositingReasonFinder::isViewportConstrainedFixedOrStickyLayer(layer)) if (CompositingReasonFinder::isViewportConstrainedFixedOrStickyLayer(layer))
...@@ -2197,67 +2147,6 @@ void RenderLayerCompositor::removeViewportConstrainedLayer(RenderLayer* layer) ...@@ -2197,67 +2147,6 @@ void RenderLayerCompositor::removeViewportConstrainedLayer(RenderLayer* layer)
m_viewportConstrainedLayers.remove(layer); m_viewportConstrainedLayers.remove(layer);
} }
FixedPositionViewportConstraints RenderLayerCompositor::computeFixedViewportConstraints(RenderLayer* layer) const
{
ASSERT(layer->hasCompositedLayerMapping());
FrameView* frameView = m_renderView.frameView();
LayoutRect viewportRect = frameView->viewportConstrainedVisibleContentRect();
FixedPositionViewportConstraints constraints;
GraphicsLayer* graphicsLayer = layer->compositedLayerMapping()->mainGraphicsLayer();
constraints.setLayerPositionAtLastLayout(graphicsLayer->position());
constraints.setViewportRectAtLastLayout(viewportRect);
RenderStyle* style = layer->renderer()->style();
if (!style->left().isAuto())
constraints.addAnchorEdge(ViewportConstraints::AnchorEdgeLeft);
if (!style->right().isAuto())
constraints.addAnchorEdge(ViewportConstraints::AnchorEdgeRight);
if (!style->top().isAuto())
constraints.addAnchorEdge(ViewportConstraints::AnchorEdgeTop);
if (!style->bottom().isAuto())
constraints.addAnchorEdge(ViewportConstraints::AnchorEdgeBottom);
// If left and right are auto, use left.
if (style->left().isAuto() && style->right().isAuto())
constraints.addAnchorEdge(ViewportConstraints::AnchorEdgeLeft);
// If top and bottom are auto, use top.
if (style->top().isAuto() && style->bottom().isAuto())
constraints.addAnchorEdge(ViewportConstraints::AnchorEdgeTop);
return constraints;
}
StickyPositionViewportConstraints RenderLayerCompositor::computeStickyViewportConstraints(RenderLayer* layer) const
{
ASSERT(layer->hasCompositedLayerMapping());
// We should never get here for stickies constrained by an enclosing clipping layer.
ASSERT(!layer->enclosingOverflowClipLayer(ExcludeSelf));
FrameView* frameView = m_renderView.frameView();
LayoutRect viewportRect = frameView->viewportConstrainedVisibleContentRect();
StickyPositionViewportConstraints constraints;
RenderBoxModelObject* renderer = toRenderBoxModelObject(layer->renderer());
renderer->computeStickyPositionConstraints(constraints, viewportRect);
GraphicsLayer* graphicsLayer = layer->compositedLayerMapping()->mainGraphicsLayer();
constraints.setLayerPositionAtLastLayout(graphicsLayer->position());
constraints.setStickyOffsetAtLastLayout(renderer->stickyPositionOffset());
return constraints;
}
ScrollingCoordinator* RenderLayerCompositor::scrollingCoordinator() const ScrollingCoordinator* RenderLayerCompositor::scrollingCoordinator() const
{ {
if (Page* page = this->page()) if (Page* page = this->page())
......
...@@ -166,12 +166,6 @@ public: ...@@ -166,12 +166,6 @@ public:
void setIsInWindow(bool); void setIsInWindow(bool);
void clearMappingForAllRenderLayers();
// Walk the tree looking for layers with 3d transforms. Useful in case you need
// to know if there is non-affine content, e.g. for drawing into an image.
bool has3DContent() const;
static RenderLayerCompositor* frameContentsCompositor(RenderPart*); static RenderLayerCompositor* frameContentsCompositor(RenderPart*);
// Return true if the layers changed. // Return true if the layers changed.
static bool parentFrameContentLayers(RenderPart*); static bool parentFrameContentLayers(RenderPart*);
...@@ -273,8 +267,6 @@ private: ...@@ -273,8 +267,6 @@ private:
bool allocateOrClearCompositedLayerMapping(RenderLayer*, CompositingStateTransitionType compositedLayerUpdate); bool allocateOrClearCompositedLayerMapping(RenderLayer*, CompositingStateTransitionType compositedLayerUpdate);
bool updateSquashingAssignment(RenderLayer*, SquashingState&, CompositingStateTransitionType compositedLayerUpdate); bool updateSquashingAssignment(RenderLayer*, SquashingState&, CompositingStateTransitionType compositedLayerUpdate);
void clearMappingForRenderLayerIncludingDescendants(RenderLayer*);
void recursiveRepaintLayer(RenderLayer*); void recursiveRepaintLayer(RenderLayer*);
void addToOverlapMap(OverlapMap&, RenderLayer*, const IntRect& layerBounds); void addToOverlapMap(OverlapMap&, RenderLayer*, const IntRect& layerBounds);
...@@ -289,18 +281,10 @@ private: ...@@ -289,18 +281,10 @@ private:
void assignLayersToBackings(RenderLayer*, bool& layersChanged); void assignLayersToBackings(RenderLayer*, bool& layersChanged);
void assignLayersToBackingsInternal(RenderLayer*, SquashingState&, bool& layersChanged, RenderLayer* clippingAncestor); void assignLayersToBackingsInternal(RenderLayer*, SquashingState&, bool& layersChanged, RenderLayer* clippingAncestor);
// Allocates, sets up hierarchy, and sets appropriate properties for the GraphicsLayers that correspond to a given
// composited RenderLayer. Does nothing if the given RenderLayer does not have a CompositedLayerMapping.
void updateGraphicsLayersMappedToRenderLayer(RenderLayer*);
// Recurses down the tree, updating layer geometry only.
void updateLayerTreeGeometry(RenderLayer*);
// Hook compositing layers together // Hook compositing layers together
void setCompositingParent(RenderLayer* childLayer, RenderLayer* parentLayer); void setCompositingParent(RenderLayer* childLayer, RenderLayer* parentLayer);
void removeCompositedChildren(RenderLayer*); void removeCompositedChildren(RenderLayer*);
bool layerHas3DContent(const RenderLayer*) const;
bool isRunningAcceleratedTransformAnimation(RenderObject*) const; bool isRunningAcceleratedTransformAnimation(RenderObject*) const;
bool hasAnyAdditionalCompositedLayers(const RenderLayer* rootLayer) const; bool hasAnyAdditionalCompositedLayers(const RenderLayer* rootLayer) const;
...@@ -324,9 +308,6 @@ private: ...@@ -324,9 +308,6 @@ private:
void addViewportConstrainedLayer(RenderLayer*); void addViewportConstrainedLayer(RenderLayer*);
FixedPositionViewportConstraints computeFixedViewportConstraints(RenderLayer*) const;
StickyPositionViewportConstraints computeStickyViewportConstraints(RenderLayer*) const;
bool requiresHorizontalScrollbarLayer() const; bool requiresHorizontalScrollbarLayer() const;
bool requiresVerticalScrollbarLayer() const; bool requiresVerticalScrollbarLayer() const;
bool requiresScrollCornerLayer() const; bool requiresScrollCornerLayer() const;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment