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 "cc/tree_synchronizer.h" |
8 | 8 |
9 #include "CCLayerImpl.h" | 9 #include "CCLayerImpl.h" |
10 #include "CCScrollbarAnimationController.h" | 10 #include "CCScrollbarAnimationController.h" |
11 #include "CCScrollbarLayerImpl.h" | 11 #include "CCScrollbarLayerImpl.h" |
12 #include "LayerChromium.h" | 12 #include "cc/layer.h" |
13 #include "ScrollbarLayerChromium.h" | 13 #include "cc/scrollbar_layer.h" |
14 | 14 |
15 namespace cc { | 15 namespace cc { |
16 | 16 |
17 scoped_ptr<CCLayerImpl> TreeSynchronizer::synchronizeTrees(LayerChromium* layerC
hromiumRoot, scoped_ptr<CCLayerImpl> oldCCLayerImplRoot, CCLayerTreeHostImpl* ho
stImpl) | 17 scoped_ptr<CCLayerImpl> TreeSynchronizer::synchronizeTrees(LayerChromium* layerC
hromiumRoot, scoped_ptr<CCLayerImpl> oldCCLayerImplRoot, CCLayerTreeHostImpl* ho
stImpl) |
18 { | 18 { |
19 ScopedPtrCCLayerImplMap oldLayers; | 19 ScopedPtrCCLayerImplMap oldLayers; |
20 RawPtrCCLayerImplMap newLayers; | 20 RawPtrCCLayerImplMap newLayers; |
21 | 21 |
22 collectExistingCCLayerImplRecursive(oldLayers, oldCCLayerImplRoot.Pass()); | 22 collectExistingCCLayerImplRecursive(oldLayers, oldCCLayerImplRoot.Pass()); |
23 | 23 |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 ASSERT(ccScrollbarLayerImpl); | 103 ASSERT(ccScrollbarLayerImpl); |
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 |