| Index: sky/engine/core/rendering/RenderLayer.cpp
|
| diff --git a/sky/engine/core/rendering/RenderLayer.cpp b/sky/engine/core/rendering/RenderLayer.cpp
|
| index bc47aa9e4bd8f1dc96ef9f7b3635aa027f43ef53..df9432662546d06e73279d545cf8ead4a7f568bf 100644
|
| --- a/sky/engine/core/rendering/RenderLayer.cpp
|
| +++ b/sky/engine/core/rendering/RenderLayer.cpp
|
| @@ -94,7 +94,6 @@ RenderLayer::RenderLayer(RenderLayerModelObject* renderer, LayerType type)
|
| , m_hasSelfPaintingLayerDescendantDirty(false)
|
| , m_isRootLayer(renderer->isRenderView())
|
| , m_usedTransparency(false)
|
| - , m_hasVisibleNonLayerContent(false)
|
| , m_3DTransformedDescendantStatusDirty(true)
|
| , m_has3DTransformedDescendant(false)
|
| , m_containsDirtyOverlayScrollbars(false)
|
| @@ -103,7 +102,6 @@ RenderLayer::RenderLayer(RenderLayerModelObject* renderer, LayerType type)
|
| , m_needsDescendantDependentCompositingInputsUpdate(true)
|
| , m_childNeedsCompositingInputsUpdate(true)
|
| , m_hasCompositingDescendant(false)
|
| - , m_hasNonCompositedChild(false)
|
| , m_shouldIsolateCompositedDescendants(false)
|
| , m_lostGroupedMapping(false)
|
| , m_renderer(renderer)
|
| @@ -424,28 +422,6 @@ LayoutRect RenderLayer::computePaintInvalidationRect(const RenderObject* renderO
|
| return rect;
|
| }
|
|
|
| -// FIXME: this is quite brute-force. We could be more efficient if we were to
|
| -// track state and update it as appropriate as changes are made in the Render tree.
|
| -void RenderLayer::updateScrollingStateAfterCompositingChange()
|
| -{
|
| - TRACE_EVENT0("blink", "RenderLayer::updateScrollingStateAfterCompositingChange");
|
| - m_hasVisibleNonLayerContent = false;
|
| - for (RenderObject* r = renderer()->slowFirstChild(); r; r = r->nextSibling()) {
|
| - if (!r->hasLayer()) {
|
| - m_hasVisibleNonLayerContent = true;
|
| - break;
|
| - }
|
| - }
|
| -
|
| - m_hasNonCompositedChild = false;
|
| - for (RenderLayer* child = firstChild(); child; child = child->nextSibling()) {
|
| - if (child->compositingState() == NotComposited || child->compositingState() == HasOwnBackingButPaintsIntoAncestor) {
|
| - m_hasNonCompositedChild = true;
|
| - return;
|
| - }
|
| - }
|
| -}
|
| -
|
| void RenderLayer::dirty3DTransformedDescendantStatus()
|
| {
|
| RenderLayerStackingNode* stackingNode = m_stackingNode->ancestorStackingContextNode();
|
| @@ -2152,8 +2128,7 @@ void RenderLayer::invalidatePaintForBlockSelectionGaps()
|
| if (renderer()->hasOverflowClip()) {
|
| RenderBox* box = renderBox();
|
| rect.move(-box->scrolledContentOffset());
|
| - if (!scrollableArea()->usesCompositedScrolling())
|
| - rect.intersect(box->overflowClipRect(LayoutPoint()));
|
| + rect.intersect(box->overflowClipRect(LayoutPoint()));
|
| }
|
| if (renderer()->hasClip())
|
| rect.intersect(toRenderBox(renderer())->clipRect(LayoutPoint()));
|
| @@ -2172,18 +2147,6 @@ IntRect RenderLayer::blockSelectionGapsBounds() const
|
| return pixelSnappedIntRect(gapRects);
|
| }
|
|
|
| -bool RenderLayer::hasBlockSelectionGapBounds() const
|
| -{
|
| - // FIXME: it would be more accurate to return !blockSelectionGapsBounds().isEmpty(), but this is impossible
|
| - // at the moment because it causes invalid queries to layout-dependent code (crbug.com/372802).
|
| - // ASSERT(renderer()->document().lifecycle().state() >= DocumentLifecycle::LayoutClean);
|
| -
|
| - if (!renderer()->isRenderBlock())
|
| - return false;
|
| -
|
| - return toRenderBlock(renderer())->shouldPaintSelectionGaps();
|
| -}
|
| -
|
| bool RenderLayer::intersectsDamageRect(const LayoutRect& layerBounds, const LayoutRect& damageRect, const RenderLayer* rootLayer, const LayoutPoint* offsetFromRoot) const
|
| {
|
| // Always examine the canvas and the root.
|
|
|