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 "cc/tree_synchronizer.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" |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 | 93 |
94 ScrollbarLayerChromium* scrollbarLayer = layer->toScrollbarLayerChromium(); | 94 ScrollbarLayerChromium* scrollbarLayer = layer->toScrollbarLayerChromium(); |
95 if (!scrollbarLayer) | 95 if (!scrollbarLayer) |
96 return; | 96 return; |
97 | 97 |
98 RawPtrCCLayerImplMap::const_iterator iter = newLayers.find(scrollbarLayer->i
d()); | 98 RawPtrCCLayerImplMap::const_iterator iter = newLayers.find(scrollbarLayer->i
d()); |
99 CCScrollbarLayerImpl* ccScrollbarLayerImpl = iter != newLayers.end() ? stati
c_cast<CCScrollbarLayerImpl*>(iter->second) : NULL; | 99 CCScrollbarLayerImpl* ccScrollbarLayerImpl = iter != newLayers.end() ? stati
c_cast<CCScrollbarLayerImpl*>(iter->second) : NULL; |
100 iter = newLayers.find(scrollbarLayer->scrollLayerId()); | 100 iter = newLayers.find(scrollbarLayer->scrollLayerId()); |
101 CCLayerImpl* ccScrollLayerImpl = iter != newLayers.end() ? iter->second : NU
LL; | 101 CCLayerImpl* ccScrollLayerImpl = iter != newLayers.end() ? iter->second : NU
LL; |
102 | 102 |
103 ASSERT(ccScrollbarLayerImpl); | 103 DCHECK(ccScrollbarLayerImpl); |
104 ASSERT(ccScrollLayerImpl); | 104 DCHECK(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 |