OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 "config.h" | 5 #include "config.h" |
6 | 6 |
7 #include "TreeSynchronizer.h" | 7 #include "TreeSynchronizer.h" |
8 | 8 |
9 #include "CCLayerImpl.h" | 9 #include "CCLayerImpl.h" |
10 #include "CCScrollbarAnimationController.h" | 10 #include "CCScrollbarAnimationController.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 OwnPtr<CCLayerImpl> ccLayerImpl = reuseOrCreateCCLayerImpl(newLayers, oldLay
ers, layer); | 66 OwnPtr<CCLayerImpl> ccLayerImpl = reuseOrCreateCCLayerImpl(newLayers, oldLay
ers, layer); |
67 | 67 |
68 ccLayerImpl->clearChildList(); | 68 ccLayerImpl->clearChildList(); |
69 const Vector<RefPtr<LayerChromium> >& children = layer->children(); | 69 const Vector<RefPtr<LayerChromium> >& children = layer->children(); |
70 for (size_t i = 0; i < children.size(); ++i) | 70 for (size_t i = 0; i < children.size(); ++i) |
71 ccLayerImpl->addChild(synchronizeTreeRecursive(newLayers, oldLayers, chi
ldren[i].get(), hostImpl)); | 71 ccLayerImpl->addChild(synchronizeTreeRecursive(newLayers, oldLayers, chi
ldren[i].get(), hostImpl)); |
72 | 72 |
73 ccLayerImpl->setMaskLayer(synchronizeTreeRecursive(newLayers, oldLayers, lay
er->maskLayer(), hostImpl)); | 73 ccLayerImpl->setMaskLayer(synchronizeTreeRecursive(newLayers, oldLayers, lay
er->maskLayer(), hostImpl)); |
74 ccLayerImpl->setReplicaLayer(synchronizeTreeRecursive(newLayers, oldLayers,
layer->replicaLayer(), hostImpl)); | 74 ccLayerImpl->setReplicaLayer(synchronizeTreeRecursive(newLayers, oldLayers,
layer->replicaLayer(), hostImpl)); |
75 | 75 |
| 76 ccLayerImpl->setLayerTreeHostImpl(hostImpl); |
76 layer->pushPropertiesTo(ccLayerImpl.get()); | 77 layer->pushPropertiesTo(ccLayerImpl.get()); |
77 ccLayerImpl->setLayerTreeHostImpl(hostImpl); | |
78 | 78 |
79 // Remove all dangling pointers. The pointers will be setup later in updateS
crollbarLayerPointersRecursive phase | 79 // Remove all dangling pointers. The pointers will be setup later in updateS
crollbarLayerPointersRecursive phase |
80 if (CCScrollbarAnimationController* scrollbarController = ccLayerImpl->scrol
lbarAnimationController()) { | 80 if (CCScrollbarAnimationController* scrollbarController = ccLayerImpl->scrol
lbarAnimationController()) { |
81 scrollbarController->setHorizontalScrollbarLayer(0); | 81 scrollbarController->setHorizontalScrollbarLayer(0); |
82 scrollbarController->setVerticalScrollbarLayer(0); | 82 scrollbarController->setVerticalScrollbarLayer(0); |
83 } | 83 } |
84 | 84 |
85 return ccLayerImpl.release(); | 85 return ccLayerImpl.release(); |
86 } | 86 } |
87 | 87 |
(...skipping 15 matching lines...) Expand all Loading... |
103 CCLayerImpl* ccScrollLayerImpl = newLayers.get(scrollbarLayer->scrollLayerId
()); | 103 CCLayerImpl* ccScrollLayerImpl = newLayers.get(scrollbarLayer->scrollLayerId
()); |
104 ASSERT(ccScrollLayerImpl); | 104 ASSERT(ccScrollLayerImpl); |
105 | 105 |
106 if (ccScrollbarLayerImpl->orientation() == WebKit::WebScrollbar::Horizontal) | 106 if (ccScrollbarLayerImpl->orientation() == WebKit::WebScrollbar::Horizontal) |
107 ccScrollLayerImpl->setHorizontalScrollbarLayer(ccScrollbarLayerImpl); | 107 ccScrollLayerImpl->setHorizontalScrollbarLayer(ccScrollbarLayerImpl); |
108 else | 108 else |
109 ccScrollLayerImpl->setVerticalScrollbarLayer(ccScrollbarLayerImpl); | 109 ccScrollLayerImpl->setVerticalScrollbarLayer(ccScrollbarLayerImpl); |
110 } | 110 } |
111 | 111 |
112 } // namespace cc | 112 } // namespace cc |
OLD | NEW |