Merge back LayoutLayerModelObject into RenderBoxModelObject

Source/core/layout/LayoutLayerModelObject.cpp

Index: Source/core/layout/LayoutLayerModelObject.cpp
diff --git a/Source/core/layout/LayoutLayerModelObject.cpp b/Source/core/layout/LayoutLayerModelObject.cpp
deleted file mode 100644
index 8d70b37866c0dd1ab1894a6603a8c32362f8a2ca..0000000000000000000000000000000000000000
--- a/Source/core/layout/LayoutLayerModelObject.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- *           (C) 1999 Antti Koivisto (koivisto@kde.org)
- *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
- *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
- * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
- * Copyright (C) 2010, 2012 Google Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "core/layout/LayoutLayerModelObject.h"
-
-#include "core/frame/LocalFrame.h"
-#include "core/layout/Layer.h"
-#include "core/layout/compositing/CompositedLayerMapping.h"
-#include "core/rendering/RenderView.h"
-
-namespace blink {
-
-bool LayoutLayerModelObject::s_wasFloating = false;
-
-LayoutLayerModelObject::LayoutLayerModelObject(ContainerNode* node)
-    : LayoutObject(node)
-{
-}
-
-LayoutLayerModelObject::~LayoutLayerModelObject()
-{
-    // Our layer should have been destroyed and cleared by now
-    ASSERT(!hasLayer());
-    ASSERT(!m_layer);
-}
-
-void LayoutLayerModelObject::destroyLayer()
-{
-    setHasLayer(false);
-    m_layer = nullptr;
-}
-
-void LayoutLayerModelObject::createLayer(LayerType type)
-{
-    ASSERT(!m_layer);
-    m_layer = adoptPtr(new Layer(this, type));
-    setHasLayer(true);
-    m_layer->insertOnlyThisLayer();
-}
-
-bool LayoutLayerModelObject::hasSelfPaintingLayer() const
-{
-    return m_layer && m_layer->isSelfPaintingLayer();
-}
-
-LayerScrollableArea* LayoutLayerModelObject::scrollableArea() const
-{
-    return m_layer ? m_layer->scrollableArea() : 0;
-}
-
-void LayoutLayerModelObject::willBeDestroyed()
-{
-    if (isPositioned()) {
-        // Don't use this->view() because the document's renderView has been set to 0 during destruction.
-        if (LocalFrame* frame = this->frame()) {
-            if (FrameView* frameView = frame->view()) {
-                if (style()->hasViewportConstrainedPosition())
-                    frameView->removeViewportConstrainedObject(this);
-            }
-        }
-    }
-
-    LayoutObject::willBeDestroyed();
-
-    destroyLayer();
-}
-
-void LayoutLayerModelObject::styleWillChange(StyleDifference diff, const LayoutStyle& newStyle)
-{
-    s_wasFloating = isFloating();
-
-    if (const LayoutStyle* oldStyle = style()) {
-        if (parent() && diff.needsPaintInvalidationLayer()) {
-            if (oldStyle->hasAutoClip() != newStyle.hasAutoClip()
-                || oldStyle->clip() != newStyle.clip())
-                layer()->clipper().clearClipRectsIncludingDescendants();
-        }
-    }
-
-    LayoutObject::styleWillChange(diff, newStyle);
-}
-
-void LayoutLayerModelObject::styleDidChange(StyleDifference diff, const LayoutStyle* oldStyle)
-{
-    bool hadTransform = hasTransformRelatedProperty();
-    bool hadLayer = hasLayer();
-    bool layerWasSelfPainting = hadLayer && layer()->isSelfPaintingLayer();
-
-    LayoutObject::styleDidChange(diff, oldStyle);
-    updateFromStyle();
-
-    LayerType type = layerTypeRequired();
-    if (type != NoLayer) {
-        if (!layer() && layerCreationAllowedForSubtree()) {
-            if (s_wasFloating && isFloating())
-                setChildNeedsLayout();
-            createLayer(type);
-            if (parent() && !needsLayout()) {
-                // FIXME: We should call a specialized version of this function.
-                layer()->updateLayerPositionsAfterLayout();
-            }
-        }
-    } else if (layer() && layer()->parent()) {
-        setHasTransformRelatedProperty(false); // Either a transform wasn't specified or the object doesn't support transforms, so just null out the bit.
-        setHasReflection(false);
-        layer()->removeOnlyThisLayer(); // calls destroyLayer() which clears m_layer
-        if (s_wasFloating && isFloating())
-            setChildNeedsLayout();
-        if (hadTransform)
-            setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
-    }
-
-    if (layer()) {
-        // FIXME: Ideally we shouldn't need this setter but we can't easily infer an overflow-only layer
-        // from the style.
-        layer()->setLayerType(type);
-
-        layer()->styleChanged(diff, oldStyle);
-        if (hadLayer && layer()->isSelfPaintingLayer() != layerWasSelfPainting)
-            setChildNeedsLayout();
-    }
-
-    if (FrameView *frameView = view()->frameView()) {
-        bool newStyleIsViewportConstained = style()->hasViewportConstrainedPosition();
-        bool oldStyleIsViewportConstrained = oldStyle && oldStyle->hasViewportConstrainedPosition();
-        if (newStyleIsViewportConstained != oldStyleIsViewportConstrained) {
-            if (newStyleIsViewportConstained && layer())
-                frameView->addViewportConstrainedObject(this);
-            else
-                frameView->removeViewportConstrainedObject(this);
-        }
-    }
-}
-
-void LayoutLayerModelObject::addLayerHitTestRects(LayerHitTestRects& rects, const Layer* currentLayer, const LayoutPoint& layerOffset, const LayoutRect& containerRect) const
-{
-    if (hasLayer()) {
-        if (isRenderView()) {
-            // RenderView is handled with a special fast-path, but it needs to know the current layer.
-            LayoutObject::addLayerHitTestRects(rects, layer(), LayoutPoint(), LayoutRect());
-        } else {
-            // Since a LayoutObject never lives outside it's container Layer, we can switch
-            // to marking entire layers instead. This may sometimes mark more than necessary (when
-            // a layer is made of disjoint objects) but in practice is a significant performance
-            // savings.
-            layer()->addLayerHitTestRects(rects);
-        }
-    } else {
-        LayoutObject::addLayerHitTestRects(rects, currentLayer, layerOffset, containerRect);
-    }
-}
-
-void LayoutLayerModelObject::invalidateTreeIfNeeded(const PaintInvalidationState& paintInvalidationState)
-{
-    ASSERT(!needsLayout());
-
-    if (!shouldCheckForPaintInvalidation(paintInvalidationState))
-        return;
-
-    bool establishesNewPaintInvalidationContainer = isPaintInvalidationContainer();
-    const LayoutLayerModelObject& newPaintInvalidationContainer = *adjustCompositedContainerForSpecialAncestors(establishesNewPaintInvalidationContainer ? this : &paintInvalidationState.paintInvalidationContainer());
-    // FIXME: This assert should be re-enabled when we move paint invalidation to after compositing update. crbug.com/360286
-    // ASSERT(&newPaintInvalidationContainer == containerForPaintInvalidation());
-
-    PaintInvalidationReason reason = invalidatePaintIfNeeded(paintInvalidationState, newPaintInvalidationContainer);
-    clearPaintInvalidationState(paintInvalidationState);
-
-    PaintInvalidationState childTreeWalkState(paintInvalidationState, *this, newPaintInvalidationContainer);
-    if (reason == PaintInvalidationLocationChange)
-        childTreeWalkState.setForceCheckForPaintInvalidation();
-    invalidatePaintOfSubtreesIfNeeded(childTreeWalkState);
-}
-
-void LayoutLayerModelObject::setBackingNeedsPaintInvalidationInRect(const LayoutRect& r, PaintInvalidationReason invalidationReason) const
-{
-    // https://bugs.webkit.org/show_bug.cgi?id=61159 describes an unreproducible crash here,
-    // so assert but check that the layer is composited.
-    ASSERT(compositingState() != NotComposited);
-
-    // FIXME: generalize accessors to backing GraphicsLayers so that this code is squashing-agnostic.
-    if (layer()->groupedMapping()) {
-        LayoutRect paintInvalidationRect = r;
-        if (GraphicsLayer* squashingLayer = layer()->groupedMapping()->squashingLayer()) {
-            // Note: the subpixel accumulation of layer() does not need to be added here. It is already taken into account.
-            squashingLayer->setNeedsDisplayInRect(pixelSnappedIntRect(paintInvalidationRect), invalidationReason);
-        }
-    } else {
-        layer()->compositedLayerMapping()->setContentsNeedDisplayInRect(r, invalidationReason);
-    }
-}
-
-void LayoutLayerModelObject::addChildFocusRingRects(Vector<LayoutRect>& rects, const LayoutPoint& additionalOffset) const
-{
-    for (LayoutObject* current = slowFirstChild(); current; current = current->nextSibling()) {
-        if (current->isText() || current->isListMarker())
-            continue;
-
-        if (!current->isBox()) {
-            current->addFocusRingRects(rects, additionalOffset);
-            continue;
-        }
-
-        RenderBox* box = toRenderBox(current);
-        if (!box->hasLayer()) {
-            box->addFocusRingRects(rects, additionalOffset + box->locationOffset());
-            continue;
-        }
-
-        Vector<LayoutRect> layerFocusRingRects;
-        box->addFocusRingRects(layerFocusRingRects, LayoutPoint());
-        for (size_t i = 0; i < layerFocusRingRects.size(); ++i) {
-            FloatQuad quadInBox = box->localToContainerQuad(FloatQuad(layerFocusRingRects[i]), this);
-            LayoutRect rect = LayoutRect(quadInBox.boundingBox());
-            if (!rect.isEmpty()) {
-                rect.moveBy(additionalOffset);
-                rects.append(rect);
-            }
-        }
-    }
-}
-
-} // namespace blink
-