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

Side by Side Diff: cc/scrollbar_layer_impl.h

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: Revised architecture - complete cl for comments on approach. Created 7 years, 10 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
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 #ifndef CC_SCROLLBAR_LAYER_IMPL_H_ 5 #ifndef CC_SCROLLBAR_LAYER_IMPL_H_
6 #define CC_SCROLLBAR_LAYER_IMPL_H_ 6 #define CC_SCROLLBAR_LAYER_IMPL_H_
7 7
8 #include "cc/cc_export.h" 8 #include "cc/cc_export.h"
9 #include "cc/scrollbar_geometry_fixed_thumb.h" 9 #include "cc/scrollbar_geometry_fixed_thumb.h"
10 #include "cc/scrollbar_layer_impl_base.h" 10 #include "cc/scrollbar_layer_impl_base.h"
(...skipping 13 matching lines...) Expand all
24 int scrollLayerId() const { return m_scrollLayerId; } 24 int scrollLayerId() const { return m_scrollLayerId; }
25 void setScrollLayerId(int id) { m_scrollLayerId = id; } 25 void setScrollLayerId(int id) { m_scrollLayerId = id; }
26 26
27 void setScrollbarData(WebKit::WebScrollbar*); 27 void setScrollbarData(WebKit::WebScrollbar*);
28 void setThumbSize(gfx::Size size); 28 void setThumbSize(gfx::Size size);
29 29
30 void setBackTrackResourceId(ResourceProvider::ResourceId id) { m_backTrackRe sourceId = id; } 30 void setBackTrackResourceId(ResourceProvider::ResourceId id) { m_backTrackRe sourceId = id; }
31 void setForeTrackResourceId(ResourceProvider::ResourceId id) { m_foreTrackRe sourceId = id; } 31 void setForeTrackResourceId(ResourceProvider::ResourceId id) { m_foreTrackRe sourceId = id; }
32 void setThumbResourceId(ResourceProvider::ResourceId id) { m_thumbResourceId = id; } 32 void setThumbResourceId(ResourceProvider::ResourceId id) { m_thumbResourceId = id; }
33 33
34 void setIsPinchZoomScrollbar(bool isPinchZoomScrollbar) { m_isPinchZoomScrol lbar = isPinchZoomScrollbar; }
35 bool isPinchZoomScrollbar() { return m_isPinchZoomScrollbar; }
34 36
35 // ScrollbarLayerImplBase implementation. 37 // ScrollbarLayerImplBase implementation.
36 virtual float currentPos() const OVERRIDE; 38 virtual float currentPos() const OVERRIDE;
37 virtual int totalSize() const OVERRIDE; 39 virtual int totalSize() const OVERRIDE;
38 virtual int maximum() const OVERRIDE; 40 virtual int maximum() const OVERRIDE;
39 41
40 void setCurrentPos(float currentPos) { m_currentPos = currentPos; } 42 void setCurrentPos(float currentPos) { m_currentPos = currentPos; }
41 void setTotalSize(int totalSize) { m_totalSize = totalSize; } 43 void setTotalSize(int totalSize) { m_totalSize = totalSize; }
42 void setMaximum(int maximum) { m_maximum = maximum; } 44 void setMaximum(int maximum) { m_maximum = maximum; }
43 45
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 WebKit::WebScrollbar::Orientation m_orientation; 109 WebKit::WebScrollbar::Orientation m_orientation;
108 WebKit::WebScrollbar::ScrollbarControlSize m_controlSize; 110 WebKit::WebScrollbar::ScrollbarControlSize m_controlSize;
109 WebKit::WebScrollbar::ScrollbarPart m_pressedPart; 111 WebKit::WebScrollbar::ScrollbarPart m_pressedPart;
110 WebKit::WebScrollbar::ScrollbarPart m_hoveredPart; 112 WebKit::WebScrollbar::ScrollbarPart m_hoveredPart;
111 113
112 bool m_isScrollableAreaActive; 114 bool m_isScrollableAreaActive;
113 bool m_isScrollViewScrollbar; 115 bool m_isScrollViewScrollbar;
114 bool m_enabled; 116 bool m_enabled;
115 bool m_isCustomScrollbar; 117 bool m_isCustomScrollbar;
116 bool m_isOverlayScrollbar; 118 bool m_isOverlayScrollbar;
119 bool m_isPinchZoomScrollbar;
117 }; 120 };
118 121
119 } 122 }
120 #endif // CC_SCROLLBAR_LAYER_IMPL_H_ 123 #endif // CC_SCROLLBAR_LAYER_IMPL_H_
OLDNEW
« cc/scrollbar_layer.h ('K') | « cc/scrollbar_layer.cc ('k') | cc/scrollbar_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698