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" |
11 #include "CCScrollbarLayerImpl.h" | 11 #include "CCScrollbarLayerImpl.h" |
12 #include "LayerChromium.h" | 12 #include "LayerChromium.h" |
13 #include "ScrollbarLayerChromium.h" | 13 #include "ScrollbarLayerChromium.h" |
14 #include <wtf/RefPtr.h> | 14 #include <wtf/RefPtr.h> |
15 | 15 |
16 namespace WebCore { | 16 namespace cc { |
17 | 17 |
18 PassOwnPtr<CCLayerImpl> TreeSynchronizer::synchronizeTrees(LayerChromium* layerC
hromiumRoot, PassOwnPtr<CCLayerImpl> oldCCLayerImplRoot, CCLayerTreeHostImpl* ho
stImpl) | 18 PassOwnPtr<CCLayerImpl> TreeSynchronizer::synchronizeTrees(LayerChromium* layerC
hromiumRoot, PassOwnPtr<CCLayerImpl> oldCCLayerImplRoot, CCLayerTreeHostImpl* ho
stImpl) |
19 { | 19 { |
20 OwnPtrCCLayerImplMap oldLayers; | 20 OwnPtrCCLayerImplMap oldLayers; |
21 RawPtrCCLayerImplMap newLayers; | 21 RawPtrCCLayerImplMap newLayers; |
22 | 22 |
23 collectExistingCCLayerImplRecursive(oldLayers, oldCCLayerImplRoot); | 23 collectExistingCCLayerImplRecursive(oldLayers, oldCCLayerImplRoot); |
24 | 24 |
25 OwnPtr<CCLayerImpl> newTree = synchronizeTreeRecursive(newLayers, oldLayers,
layerChromiumRoot, hostImpl); | 25 OwnPtr<CCLayerImpl> newTree = synchronizeTreeRecursive(newLayers, oldLayers,
layerChromiumRoot, hostImpl); |
26 | 26 |
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 ASSERT(ccScrollbarLayerImpl); | 102 ASSERT(ccScrollbarLayerImpl); |
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 WebCore | 112 } // namespace cc |
OLD | NEW |