mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
74290d5007
Change hit testing to walk over the render tree instead of the RenderLayer tree. This is a step in the direction of removing the RenderLayer tree entirely. For now, there's a few calls back into RenderLayer that will be removed in a followup patch. This patch also breaks hit testing on transformed inlines. I'll be removing the ability to transform inlines in a followup patch anyways, so it's ok for hit testing to give the wrong result temporarily here. Almost all of this patch is just moving code from RenderLayer to RenderBox. The primary substantive change is in RenderBox::hitTestLayer. Instead of having hitTestChildren calls, we call collectSelfPaintingLayers, reverse sort by z-index (so we start at the top), and then iterate over the result. The test-case also exposes that we don't correctly hit transformed elements inside inline-blocks. I went back as far as 4153b8a515d54275934d4244aaf2d5a7a8fe3333 and the bug still happened. R=abarth@chromium.org Review URL: https://codereview.chromium.org/945693002
132 lines
4.3 KiB
C++
132 lines
4.3 KiB
C++
/*
|
|
* 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 "sky/engine/config.h"
|
|
#include "sky/engine/core/rendering/RenderLayerModelObject.h"
|
|
|
|
#include "sky/engine/core/frame/LocalFrame.h"
|
|
#include "sky/engine/core/rendering/RenderLayer.h"
|
|
#include "sky/engine/core/rendering/RenderView.h"
|
|
|
|
namespace blink {
|
|
|
|
RenderLayerModelObject::RenderLayerModelObject(ContainerNode* node)
|
|
: RenderObject(node)
|
|
{
|
|
}
|
|
|
|
RenderLayerModelObject::~RenderLayerModelObject()
|
|
{
|
|
// Our layer should have been destroyed and cleared by now
|
|
ASSERT(!hasLayer());
|
|
ASSERT(!m_layer);
|
|
}
|
|
|
|
void RenderLayerModelObject::destroyLayer()
|
|
{
|
|
setHasLayer(false);
|
|
m_layer = nullptr;
|
|
}
|
|
|
|
void RenderLayerModelObject::createLayer(LayerType type)
|
|
{
|
|
ASSERT(!m_layer);
|
|
m_layer = adoptPtr(new RenderLayer(this, type));
|
|
setHasLayer(true);
|
|
m_layer->insertOnlyThisLayer();
|
|
}
|
|
|
|
bool RenderLayerModelObject::hasSelfPaintingLayer() const
|
|
{
|
|
return m_layer && m_layer->isSelfPaintingLayer();
|
|
}
|
|
|
|
void RenderLayerModelObject::collectSelfPaintingLayers(Vector<RenderBox*>& layers)
|
|
{
|
|
for (RenderObject* child = slowFirstChild(); child; child = child->nextSibling()) {
|
|
if (child->isBox()) {
|
|
RenderBox* childBox = toRenderBox(child);
|
|
if (childBox->hasSelfPaintingLayer())
|
|
layers.append(childBox);
|
|
else
|
|
childBox->collectSelfPaintingLayers(layers);
|
|
} else if (child->isLayerModelObject()) {
|
|
toRenderLayerModelObject(child)->collectSelfPaintingLayers(layers);
|
|
}
|
|
}
|
|
}
|
|
|
|
void RenderLayerModelObject::willBeDestroyed()
|
|
{
|
|
RenderObject::willBeDestroyed();
|
|
destroyLayer();
|
|
}
|
|
|
|
void RenderLayerModelObject::styleWillChange(StyleDifference diff, const RenderStyle& newStyle)
|
|
{
|
|
if (RenderStyle* oldStyle = style()) {
|
|
if (parent()) {
|
|
if (oldStyle->hasAutoClip() != newStyle.hasAutoClip()
|
|
|| oldStyle->clip() != newStyle.clip())
|
|
layer()->clipper().clearClipRectsIncludingDescendants();
|
|
}
|
|
}
|
|
|
|
RenderObject::styleWillChange(diff, newStyle);
|
|
}
|
|
|
|
void RenderLayerModelObject::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
|
|
{
|
|
bool hadTransform = hasTransform();
|
|
|
|
RenderObject::styleDidChange(diff, oldStyle);
|
|
updateFromStyle();
|
|
|
|
LayerType type = layerTypeRequired();
|
|
if (type != NoLayer) {
|
|
if (!layer()) {
|
|
createLayer(type);
|
|
if (parent() && !needsLayout()) {
|
|
// FIXME: We should call a specialized version of this function.
|
|
layer()->updateLayerPositionsAfterLayout();
|
|
}
|
|
}
|
|
} else if (layer() && layer()->parent()) {
|
|
setHasTransform(false); // Either a transform wasn't specified or the object doesn't support transforms, so just null out the bit.
|
|
layer()->removeOnlyThisLayer(); // calls destroyLayer() which clears m_layer
|
|
if (hadTransform)
|
|
setNeedsLayoutAndPrefWidthsRecalc();
|
|
}
|
|
|
|
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);
|
|
}
|
|
}
|
|
|
|
} // namespace blink
|
|
|