| OLD | NEW | 
|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "cc/scrollbar_layer_impl.h" | 5 #include "cc/scrollbar_layer_impl.h" | 
| 6 | 6 | 
|  | 7 #include "cc/layer.h" | 
| 7 #include "cc/layer_tree_impl.h" | 8 #include "cc/layer_tree_impl.h" | 
| 8 #include "cc/layer_tree_settings.h" | 9 #include "cc/layer_tree_settings.h" | 
| 9 #include "cc/quad_sink.h" | 10 #include "cc/quad_sink.h" | 
| 10 #include "cc/scrollbar_animation_controller.h" | 11 #include "cc/scrollbar_animation_controller.h" | 
| 11 #include "cc/solid_color_draw_quad.h" | 12 #include "cc/solid_color_draw_quad.h" | 
| 12 #include "cc/texture_draw_quad.h" | 13 #include "cc/texture_draw_quad.h" | 
| 13 #include "ui/gfx/rect_conversions.h" | 14 #include "ui/gfx/rect_conversions.h" | 
| 14 | 15 | 
| 15 using WebKit::WebRect; | 16 using WebKit::WebRect; | 
| 16 using WebKit::WebScrollbar; | 17 using WebKit::WebScrollbar; | 
| (...skipping 15 matching lines...) Expand all  Loading... | 
| 32     scoped_ptr<ScrollbarGeometryFixedThumb> geometry) | 33     scoped_ptr<ScrollbarGeometryFixedThumb> geometry) | 
| 33     : ScrollbarLayerImplBase(tree_impl, id), | 34     : ScrollbarLayerImplBase(tree_impl, id), | 
| 34       scrollbar_(this), | 35       scrollbar_(this), | 
| 35       back_track_resource_id_(0), | 36       back_track_resource_id_(0), | 
| 36       fore_track_resource_id_(0), | 37       fore_track_resource_id_(0), | 
| 37       thumb_resource_id_(0), | 38       thumb_resource_id_(0), | 
| 38       geometry_(geometry.Pass()), | 39       geometry_(geometry.Pass()), | 
| 39       current_pos_(0), | 40       current_pos_(0), | 
| 40       total_size_(0), | 41       total_size_(0), | 
| 41       maximum_(0), | 42       maximum_(0), | 
| 42       scroll_layer_id_(-1), | 43       scroll_layer_id_(Layer::INVALID_ID), | 
| 43       scrollbar_overlay_style_(WebScrollbar::ScrollbarOverlayStyleDefault), | 44       scrollbar_overlay_style_(WebScrollbar::ScrollbarOverlayStyleDefault), | 
| 44       orientation_(WebScrollbar::Horizontal), | 45       orientation_(WebScrollbar::Horizontal), | 
| 45       control_size_(WebScrollbar::RegularScrollbar), | 46       control_size_(WebScrollbar::RegularScrollbar), | 
| 46       pressed_part_(WebScrollbar::NoPart), | 47       pressed_part_(WebScrollbar::NoPart), | 
| 47       hovered_part_(WebScrollbar::NoPart), | 48       hovered_part_(WebScrollbar::NoPart), | 
| 48       is_scrollable_area_active_(false), | 49       is_scrollable_area_active_(false), | 
| 49       is_scroll_view_scrollbar_(false), | 50       is_scroll_view_scrollbar_(false), | 
| 50       enabled_(false), | 51       enabled_(false), | 
| 51       is_custom_scrollbar_(false), | 52       is_custom_scrollbar_(false), | 
| 52       is_overlay_scrollbar_(false) {} | 53       is_overlay_scrollbar_(false) {} | 
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 306 | 307 | 
| 307 bool ScrollbarLayerImpl::Scrollbar::isCustomScrollbar() const { | 308 bool ScrollbarLayerImpl::Scrollbar::isCustomScrollbar() const { | 
| 308   return owner_->is_custom_scrollbar_; | 309   return owner_->is_custom_scrollbar_; | 
| 309 } | 310 } | 
| 310 | 311 | 
| 311 const char* ScrollbarLayerImpl::LayerTypeAsString() const { | 312 const char* ScrollbarLayerImpl::LayerTypeAsString() const { | 
| 312   return "ScrollbarLayer"; | 313   return "ScrollbarLayer"; | 
| 313 } | 314 } | 
| 314 | 315 | 
| 315 }  // namespace cc | 316 }  // namespace cc | 
| OLD | NEW | 
|---|