| Index: Source/core/rendering/RenderLayer.cpp
|
| diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
|
| index c77bc4f9f1fb9cbfb35a6dc08191385f14678507..ffbbf04ab2617355a42de4d7596296fe750bc92b 100644
|
| --- a/Source/core/rendering/RenderLayer.cpp
|
| +++ b/Source/core/rendering/RenderLayer.cpp
|
| @@ -122,8 +122,8 @@ RenderLayer::RenderLayer(RenderLayerModelObject* renderer, LayerType type)
|
| , m_containsDirtyOverlayScrollbars(false)
|
| , m_canSkipRepaintRectsUpdateOnScroll(renderer->isTableCell())
|
| , m_hasFilterInfo(false)
|
| - , m_needsToUpdateAncestorDependentProperties(true)
|
| - , m_childNeedsToUpdateAncestorDependantProperties(true)
|
| + , m_needsCompositingInputsUpdate(true)
|
| + , m_childNeedsCompositingInputsUpdate(true)
|
| , m_hasCompositingDescendant(false)
|
| , m_hasNonCompositedChild(false)
|
| , m_shouldIsolateCompositedDescendants(false)
|
| @@ -745,7 +745,7 @@ void RenderLayer::setHasVisibleContent()
|
| m_hasVisibleContent = true;
|
| m_visibleContentStatusDirty = false;
|
|
|
| - setNeedsToUpdateAncestorDependentProperties();
|
| + setNeedsCompositingInputsUpdate();
|
| repainter().computeRepaintRects();
|
|
|
| if (parent())
|
| @@ -876,7 +876,7 @@ void RenderLayer::updateDescendantDependentFlags()
|
| // FIXME: We can remove this code once we remove the recursive tree
|
| // walk inside updateGraphicsLayerGeometry.
|
| if (hasVisibleContent() != previouslyHasVisibleContent)
|
| - setNeedsToUpdateAncestorDependentProperties();
|
| + setNeedsCompositingInputsUpdate();
|
| }
|
| }
|
|
|
| @@ -1070,7 +1070,7 @@ RenderLayer* RenderLayer::enclosingTransformedAncestor() const
|
|
|
| LayoutPoint RenderLayer::computeOffsetFromTransformedAncestor() const
|
| {
|
| - const AncestorDependentProperties& properties = ancestorDependentProperties();
|
| + const CompositingInputs& properties = compositingInputs();
|
|
|
| TransformState transformState(TransformState::ApplyTransformDirection, FloatPoint());
|
| // FIXME: add a test that checks flipped writing mode and ApplyContainerFlip are correct.
|
| @@ -1173,24 +1173,24 @@ RenderLayer* RenderLayer::enclosingFilterLayer(IncludeSelfOrNot includeSelf) con
|
| return 0;
|
| }
|
|
|
| -void RenderLayer::setNeedsToUpdateAncestorDependentProperties()
|
| +void RenderLayer::setNeedsCompositingInputsUpdate()
|
| {
|
| - m_needsToUpdateAncestorDependentProperties = true;
|
| + m_needsCompositingInputsUpdate = true;
|
|
|
| - for (RenderLayer* current = this; current && !current->m_childNeedsToUpdateAncestorDependantProperties; current = current->parent())
|
| - current->m_childNeedsToUpdateAncestorDependantProperties = true;
|
| + for (RenderLayer* current = this; current && !current->m_childNeedsCompositingInputsUpdate; current = current->parent())
|
| + current->m_childNeedsCompositingInputsUpdate = true;
|
| }
|
|
|
| -void RenderLayer::updateAncestorDependentProperties(const AncestorDependentProperties& ancestorDependentProperties)
|
| +void RenderLayer::updateCompositingInputs(const CompositingInputs& compositingInputs)
|
| {
|
| - m_ancestorDependentProperties = ancestorDependentProperties;
|
| - m_needsToUpdateAncestorDependentProperties = false;
|
| + m_compositingInputs = compositingInputs;
|
| + m_needsCompositingInputsUpdate = false;
|
| }
|
|
|
| -void RenderLayer::clearChildNeedsToUpdateAncestorDependantProperties()
|
| +void RenderLayer::clearChildNeedsCompositingInputsUpdate()
|
| {
|
| - ASSERT(!m_needsToUpdateAncestorDependentProperties);
|
| - m_childNeedsToUpdateAncestorDependantProperties = false;
|
| + ASSERT(!m_needsCompositingInputsUpdate);
|
| + m_childNeedsCompositingInputsUpdate = false;
|
| }
|
|
|
| void RenderLayer::setCompositingReasons(CompositingReasons reasons, CompositingReasons mask)
|
| @@ -1388,7 +1388,7 @@ void RenderLayer::addChild(RenderLayer* child, RenderLayer* beforeChild)
|
|
|
| child->m_parent = this;
|
|
|
| - setNeedsToUpdateAncestorDependentProperties();
|
| + setNeedsCompositingInputsUpdate();
|
|
|
| if (child->stackingNode()->isNormalFlowOnly())
|
| m_stackingNode->dirtyNormalFlowList();
|
| @@ -3728,7 +3728,7 @@ void RenderLayer::styleChanged(StyleDifference diff, const RenderStyle* oldStyle
|
|
|
| compositor()->updateStyleDeterminedCompositingReasons(this);
|
|
|
| - setNeedsToUpdateAncestorDependentProperties();
|
| + setNeedsCompositingInputsUpdate();
|
|
|
| // FIXME: Remove incremental compositing updates after fixing the chicken/egg issues
|
| // https://code.google.com/p/chromium/issues/detail?id=343756
|
|
|