diff options
author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 01:09:04 +0000 |
---|---|---|
committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 01:09:04 +0000 |
commit | 00cd54b939d7498ddc2e5ae355a03250f13b35d7 (patch) | |
tree | c5731f4530f727bac1aa15c4c73bd547f398aba5 | |
parent | 0f747a15410602eb58d67d33d0f053fcdbaf5a2a (diff) | |
download | chromium_src-00cd54b939d7498ddc2e5ae355a03250f13b35d7.zip chromium_src-00cd54b939d7498ddc2e5ae355a03250f13b35d7.tar.gz chromium_src-00cd54b939d7498ddc2e5ae355a03250f13b35d7.tar.bz2 |
Deprecates Layer::GetLayerProperties which is no longer used
Test=Function not called anywhere in code search, compiles
Review URL: http://codereview.chromium.org/9386019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121797 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | ui/gfx/compositor/layer.cc | 24 | ||||
-rw-r--r-- | ui/gfx/compositor/layer.h | 6 |
2 files changed, 0 insertions, 30 deletions
diff --git a/ui/gfx/compositor/layer.cc b/ui/gfx/compositor/layer.cc index 9795409..c93d036d 100644 --- a/ui/gfx/compositor/layer.cc +++ b/ui/gfx/compositor/layer.cc @@ -332,30 +332,6 @@ void Layer::StackRelativeTo(Layer* child, Layer* other, bool above) { web_layer_.insertChild(child->web_layer_, dest_i); } -void Layer::GetLayerProperties(const ui::Transform& parent_transform, - std::vector<LayerProperties>* traversal) { - if (!visible_ || opacity_ != 1.0f) - return; - - ui::Transform current_transform; - if (transform().HasChange()) - current_transform.ConcatTransform(transform()); - current_transform.ConcatTranslate( - static_cast<float>(bounds().x()), - static_cast<float>(bounds().y())); - current_transform.ConcatTransform(parent_transform); - - if (fills_bounds_opaquely_ && type_ != LAYER_NOT_DRAWN) { - LayerProperties properties; - properties.layer = this; - properties.transform_relative_to_root = current_transform; - traversal->push_back(properties); - } - - for (size_t i = 0; i < children_.size(); i++) - children_[i]->GetLayerProperties(current_transform, traversal); -} - bool Layer::ConvertPointForAncestor(const Layer* ancestor, gfx::Point* point) const { ui::Transform transform; diff --git a/ui/gfx/compositor/layer.h b/ui/gfx/compositor/layer.h index e6c7051..ee2b429 100644 --- a/ui/gfx/compositor/layer.h +++ b/ui/gfx/compositor/layer.h @@ -211,12 +211,6 @@ class COMPOSITOR_EXPORT Layer : // StackBelow(). void StackRelativeTo(Layer* child, Layer* other, bool above); - // Does a preorder traversal of layers starting with this layer. Omits layers - // which cannot punch a hole in another layer such as non visible layers - // and layers which don't fill their bounds opaquely. - void GetLayerProperties(const ui::Transform& current_transform, - std::vector<LayerProperties>* traverasal); - bool ConvertPointForAncestor(const Layer* ancestor, gfx::Point* point) const; bool ConvertPointFromAncestor(const Layer* ancestor, gfx::Point* point) const; |