586d51edaf
In order to allow for LayerImpl to notify its host when one of its property changes, it needs to more robustly have its host set (which is not the case in most tests). To avoid a recursive pass when adding children or after layer synchronization, instead just pass it to the constructor of LayerImpl, since a given LayerImpl will never move from one host to another. NOTRY=true BUG=none Review URL: https://chromiumcodereview.appspot.com/11472021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171830 0039d316-1c4b-4281-b951-d872f2087c98
112 lines
4.2 KiB
C++
112 lines
4.2 KiB
C++
// Copyright 2011 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "cc/tree_synchronizer.h"
|
|
|
|
#include "base/debug/trace_event.h"
|
|
#include "cc/layer.h"
|
|
#include "cc/layer_impl.h"
|
|
#include "cc/scrollbar_animation_controller.h"
|
|
#include "cc/scrollbar_layer.h"
|
|
#include "cc/scrollbar_layer_impl.h"
|
|
|
|
namespace cc {
|
|
|
|
scoped_ptr<LayerImpl> TreeSynchronizer::synchronizeTrees(Layer* layerRoot, scoped_ptr<LayerImpl> oldLayerImplRoot, LayerTreeHostImpl* hostImpl)
|
|
{
|
|
TRACE_EVENT0("cc", "TreeSynchronizer::synchronizeTrees");
|
|
ScopedPtrLayerImplMap oldLayers;
|
|
RawPtrLayerImplMap newLayers;
|
|
|
|
collectExistingLayerImplRecursive(oldLayers, oldLayerImplRoot.Pass());
|
|
|
|
scoped_ptr<LayerImpl> newTree = synchronizeTreeRecursive(newLayers, oldLayers, layerRoot, hostImpl);
|
|
|
|
updateScrollbarLayerPointersRecursive(newLayers, layerRoot);
|
|
|
|
return newTree.Pass();
|
|
}
|
|
|
|
void TreeSynchronizer::collectExistingLayerImplRecursive(ScopedPtrLayerImplMap& oldLayers, scoped_ptr<LayerImpl> layerImpl)
|
|
{
|
|
if (!layerImpl)
|
|
return;
|
|
|
|
ScopedPtrVector<LayerImpl>& children = layerImpl->m_children;
|
|
for (size_t i = 0; i < children.size(); ++i)
|
|
collectExistingLayerImplRecursive(oldLayers, children.take(i));
|
|
|
|
collectExistingLayerImplRecursive(oldLayers, layerImpl->m_maskLayer.Pass());
|
|
collectExistingLayerImplRecursive(oldLayers, layerImpl->m_replicaLayer.Pass());
|
|
|
|
int id = layerImpl->id();
|
|
oldLayers.set(id, layerImpl.Pass());
|
|
}
|
|
|
|
scoped_ptr<LayerImpl> TreeSynchronizer::reuseOrCreateLayerImpl(RawPtrLayerImplMap& newLayers, ScopedPtrLayerImplMap& oldLayers, Layer* layer, LayerTreeHostImpl* hostImpl)
|
|
{
|
|
scoped_ptr<LayerImpl> layerImpl = oldLayers.take(layer->id());
|
|
|
|
if (!layerImpl)
|
|
layerImpl = layer->createLayerImpl(hostImpl);
|
|
|
|
newLayers[layer->id()] = layerImpl.get();
|
|
return layerImpl.Pass();
|
|
}
|
|
|
|
scoped_ptr<LayerImpl> TreeSynchronizer::synchronizeTreeRecursive(RawPtrLayerImplMap& newLayers, ScopedPtrLayerImplMap& oldLayers, Layer* layer, LayerTreeHostImpl* hostImpl)
|
|
{
|
|
if (!layer)
|
|
return scoped_ptr<LayerImpl>();
|
|
|
|
scoped_ptr<LayerImpl> layerImpl = reuseOrCreateLayerImpl(newLayers, oldLayers, layer, hostImpl);
|
|
|
|
layerImpl->clearChildList();
|
|
const std::vector<scoped_refptr<Layer> >& children = layer->children();
|
|
for (size_t i = 0; i < children.size(); ++i)
|
|
layerImpl->addChild(synchronizeTreeRecursive(newLayers, oldLayers, children[i].get(), hostImpl));
|
|
|
|
layerImpl->setMaskLayer(synchronizeTreeRecursive(newLayers, oldLayers, layer->maskLayer(), hostImpl));
|
|
layerImpl->setReplicaLayer(synchronizeTreeRecursive(newLayers, oldLayers, layer->replicaLayer(), hostImpl));
|
|
|
|
layer->pushPropertiesTo(layerImpl.get());
|
|
|
|
// Remove all dangling pointers. The pointers will be setup later in updateScrollbarLayerPointersRecursive phase
|
|
if (ScrollbarAnimationController* scrollbarController = layerImpl->scrollbarAnimationController()) {
|
|
scrollbarController->setHorizontalScrollbarLayer(0);
|
|
scrollbarController->setVerticalScrollbarLayer(0);
|
|
}
|
|
|
|
return layerImpl.Pass();
|
|
}
|
|
|
|
void TreeSynchronizer::updateScrollbarLayerPointersRecursive(const RawPtrLayerImplMap& newLayers, Layer* layer)
|
|
{
|
|
if (!layer)
|
|
return;
|
|
|
|
const std::vector<scoped_refptr<Layer> >& children = layer->children();
|
|
for (size_t i = 0; i < children.size(); ++i)
|
|
updateScrollbarLayerPointersRecursive(newLayers, children[i].get());
|
|
|
|
ScrollbarLayer* scrollbarLayer = layer->toScrollbarLayer();
|
|
if (!scrollbarLayer)
|
|
return;
|
|
|
|
RawPtrLayerImplMap::const_iterator iter = newLayers.find(scrollbarLayer->id());
|
|
ScrollbarLayerImpl* scrollbarLayerImpl = iter != newLayers.end() ? static_cast<ScrollbarLayerImpl*>(iter->second) : NULL;
|
|
iter = newLayers.find(scrollbarLayer->scrollLayerId());
|
|
LayerImpl* scrollLayerImpl = iter != newLayers.end() ? iter->second : NULL;
|
|
|
|
DCHECK(scrollbarLayerImpl);
|
|
DCHECK(scrollLayerImpl);
|
|
|
|
if (scrollbarLayerImpl->orientation() == WebKit::WebScrollbar::Horizontal)
|
|
scrollLayerImpl->setHorizontalScrollbarLayer(scrollbarLayerImpl);
|
|
else
|
|
scrollLayerImpl->setVerticalScrollbarLayer(scrollbarLayerImpl);
|
|
}
|
|
|
|
} // namespace cc
|