Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Side by Side Diff: cc/scrollbar_layer_impl.cc

Issue 11550035: Implement pinch-zoom scaling for main-frame scrollbars and pinch-zoom overlay scrollbars. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to fix collision with solid colour scrollbars patch. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/scrollbar_layer_impl.h ('k') | cc/scrollbar_layer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 16 matching lines...) Expand all
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 vertical_adjust_(0.f), 43 vertical_adjust_(0.f),
43 scroll_layer_id_(-1), 44 scroll_layer_id_(Layer::INVALID_ID),
44 scrollbar_overlay_style_(WebScrollbar::ScrollbarOverlayStyleDefault), 45 scrollbar_overlay_style_(WebScrollbar::ScrollbarOverlayStyleDefault),
45 orientation_(WebScrollbar::Horizontal), 46 orientation_(WebScrollbar::Horizontal),
46 control_size_(WebScrollbar::RegularScrollbar), 47 control_size_(WebScrollbar::RegularScrollbar),
47 pressed_part_(WebScrollbar::NoPart), 48 pressed_part_(WebScrollbar::NoPart),
48 hovered_part_(WebScrollbar::NoPart), 49 hovered_part_(WebScrollbar::NoPart),
49 is_scrollable_area_active_(false), 50 is_scrollable_area_active_(false),
50 is_scroll_view_scrollbar_(false), 51 is_scroll_view_scrollbar_(false),
51 enabled_(false), 52 enabled_(false),
52 is_custom_scrollbar_(false), 53 is_custom_scrollbar_(false),
53 is_overlay_scrollbar_(false) {} 54 is_overlay_scrollbar_(false) {}
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 333
333 bool ScrollbarLayerImpl::Scrollbar::isCustomScrollbar() const { 334 bool ScrollbarLayerImpl::Scrollbar::isCustomScrollbar() const {
334 return owner_->is_custom_scrollbar_; 335 return owner_->is_custom_scrollbar_;
335 } 336 }
336 337
337 const char* ScrollbarLayerImpl::LayerTypeAsString() const { 338 const char* ScrollbarLayerImpl::LayerTypeAsString() const {
338 return "ScrollbarLayer"; 339 return "ScrollbarLayer";
339 } 340 }
340 341
341 } // namespace cc 342 } // namespace cc
OLDNEW
« no previous file with comments | « cc/scrollbar_layer_impl.h ('k') | cc/scrollbar_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698