| OLD | NEW |
| 1 | 1 |
| 2 // Copyright 2012 The Chromium Authors. All rights reserved. | 2 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 3 // Use of this source code is governed by a BSD-style license that can be | 3 // Use of this source code is governed by a BSD-style license that can be |
| 4 // found in the LICENSE file. | 4 // found in the LICENSE file. |
| 5 | 5 |
| 6 #include "cc/layers/scrollbar_layer.h" | 6 #include "cc/layers/scrollbar_layer.h" |
| 7 | 7 |
| 8 #if USE_REGULAR_SCROLLBAR |
| 9 |
| 8 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| 9 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 10 #include "base/debug/trace_event.h" | 12 #include "base/debug/trace_event.h" |
| 11 #include "cc/layers/scrollbar_layer_impl.h" | 13 #include "cc/layers/scrollbar_layer_impl.h" |
| 12 #include "cc/resources/caching_bitmap_content_layer_updater.h" | 14 #include "cc/resources/caching_bitmap_content_layer_updater.h" |
| 13 #include "cc/resources/layer_painter.h" | 15 #include "cc/resources/layer_painter.h" |
| 14 #include "cc/resources/prioritized_resource.h" | 16 #include "cc/resources/prioritized_resource.h" |
| 15 #include "cc/resources/resource_update_queue.h" | 17 #include "cc/resources/resource_update_queue.h" |
| 16 #include "cc/trees/layer_tree_host.h" | 18 #include "cc/trees/layer_tree_host.h" |
| 17 #include "ui/gfx/rect_conversions.h" | 19 #include "ui/gfx/rect_conversions.h" |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 thumb_size = gfx::Size(scrollbar_->ThumbLength(), | 340 thumb_size = gfx::Size(scrollbar_->ThumbLength(), |
| 339 scrollbar_->ThumbThickness()); | 341 scrollbar_->ThumbThickness()); |
| 340 } else { | 342 } else { |
| 341 thumb_size = gfx::Size(scrollbar_->ThumbThickness(), | 343 thumb_size = gfx::Size(scrollbar_->ThumbThickness(), |
| 342 scrollbar_->ThumbLength()); | 344 scrollbar_->ThumbLength()); |
| 343 } | 345 } |
| 344 return ScrollbarLayerRectToContentRect(gfx::Rect(thumb_size)); | 346 return ScrollbarLayerRectToContentRect(gfx::Rect(thumb_size)); |
| 345 } | 347 } |
| 346 | 348 |
| 347 } // namespace cc | 349 } // namespace cc |
| 350 |
| 351 #endif |
| OLD | NEW |