| OLD | NEW |
| 1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/layer.h" | 5 #include "cc/layer.h" |
| 6 | 6 |
| 7 #include "cc/active_animation.h" | 7 #include "cc/active_animation.h" |
| 8 #include "cc/animation_events.h" | 8 #include "cc/animation_events.h" |
| 9 #include "cc/layer_animation_controller.h" | 9 #include "cc/layer_animation_controller.h" |
| 10 #include "cc/layer_impl.h" | 10 #include "cc/layer_impl.h" |
| (...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 607 if (replicaLayer()) | 607 if (replicaLayer()) |
| 608 replicaLayer()->pushPropertiesTo(layer->replicaLayer()); | 608 replicaLayer()->pushPropertiesTo(layer->replicaLayer()); |
| 609 | 609 |
| 610 m_layerAnimationController->pushAnimationUpdatesTo(layer->layerAnimationCont
roller()); | 610 m_layerAnimationController->pushAnimationUpdatesTo(layer->layerAnimationCont
roller()); |
| 611 | 611 |
| 612 // Reset any state that should be cleared for the next update. | 612 // Reset any state that should be cleared for the next update. |
| 613 m_stackingOrderChanged = false; | 613 m_stackingOrderChanged = false; |
| 614 m_updateRect = gfx::RectF(); | 614 m_updateRect = gfx::RectF(); |
| 615 } | 615 } |
| 616 | 616 |
| 617 scoped_ptr<LayerImpl> Layer::createLayerImpl() | 617 scoped_ptr<LayerImpl> Layer::createLayerImpl(LayerTreeHostImpl* hostImpl) |
| 618 { | 618 { |
| 619 return LayerImpl::create(m_layerId); | 619 return LayerImpl::create(hostImpl, m_layerId); |
| 620 } | 620 } |
| 621 | 621 |
| 622 bool Layer::drawsContent() const | 622 bool Layer::drawsContent() const |
| 623 { | 623 { |
| 624 return m_isDrawable; | 624 return m_isDrawable; |
| 625 } | 625 } |
| 626 | 626 |
| 627 bool Layer::needMoreUpdates() | 627 bool Layer::needMoreUpdates() |
| 628 { | 628 { |
| 629 return false; | 629 return false; |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 835 { | 835 { |
| 836 return 0; | 836 return 0; |
| 837 } | 837 } |
| 838 | 838 |
| 839 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped
_refptr<Layer> >::iterator, void*) | 839 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped
_refptr<Layer> >::iterator, void*) |
| 840 { | 840 { |
| 841 // Currently we don't use z-order to decide what to paint, so there's no nee
d to actually sort Layers. | 841 // Currently we don't use z-order to decide what to paint, so there's no nee
d to actually sort Layers. |
| 842 } | 842 } |
| 843 | 843 |
| 844 } // namespace cc | 844 } // namespace cc |
| OLD | NEW |