| 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" | |
| 6 | |
| 7 #include "cc/tree_synchronizer.h" | 5 #include "cc/tree_synchronizer.h" |
| 8 | 6 |
| 9 #include "cc/layer.h" | 7 #include "cc/layer.h" |
| 10 #include "cc/layer_impl.h" | 8 #include "cc/layer_impl.h" |
| 11 #include "cc/scrollbar_animation_controller.h" | 9 #include "cc/scrollbar_animation_controller.h" |
| 12 #include "cc/scrollbar_layer.h" | 10 #include "cc/scrollbar_layer.h" |
| 13 #include "cc/scrollbar_layer_impl.h" | 11 #include "cc/scrollbar_layer_impl.h" |
| 14 | 12 |
| 15 namespace cc { | 13 namespace cc { |
| 16 | 14 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 DCHECK(scrollbarLayerImpl); | 101 DCHECK(scrollbarLayerImpl); |
| 104 DCHECK(scrollLayerImpl); | 102 DCHECK(scrollLayerImpl); |
| 105 | 103 |
| 106 if (scrollbarLayerImpl->orientation() == WebKit::WebScrollbar::Horizontal) | 104 if (scrollbarLayerImpl->orientation() == WebKit::WebScrollbar::Horizontal) |
| 107 scrollLayerImpl->setHorizontalScrollbarLayer(scrollbarLayerImpl); | 105 scrollLayerImpl->setHorizontalScrollbarLayer(scrollbarLayerImpl); |
| 108 else | 106 else |
| 109 scrollLayerImpl->setVerticalScrollbarLayer(scrollbarLayerImpl); | 107 scrollLayerImpl->setVerticalScrollbarLayer(scrollbarLayerImpl); |
| 110 } | 108 } |
| 111 | 109 |
| 112 } // namespace cc | 110 } // namespace cc |
| OLD | NEW |