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

Unified Diff: cc/layers/scrollbar_layer_impl.h

Issue 18191020: UI Resource Manager (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: cc/layers/scrollbar_layer_impl.h
===================================================================
--- cc/layers/scrollbar_layer_impl.h (revision 210393)
+++ cc/layers/scrollbar_layer_impl.h (working copy)
@@ -8,6 +8,7 @@
#include "cc/base/cc_export.h"
#include "cc/input/scrollbar.h"
#include "cc/layers/layer_impl.h"
+#include "cc/resources/ui_resource_manager_client.h"
namespace cc {
@@ -57,12 +58,7 @@
void set_vertical_adjust(float vertical_adjust) {
vertical_adjust_ = vertical_adjust;
}
- void set_track_resource_id(ResourceProvider::ResourceId id) {
- track_resource_id_ = id;
- }
- void set_thumb_resource_id(ResourceProvider::ResourceId id) {
- thumb_resource_id_ = id;
- }
+
void set_visible_to_total_length_ratio(float ratio) {
visible_to_total_length_ratio_ = ratio;
}
@@ -72,6 +68,9 @@
gfx::Rect ComputeThumbQuadRect() const;
+ void set_track_ui_resource_id(UIResourceId id);
aelias_OOO_until_Jul13 2013/07/23 00:06:48 Please move these up near the other set_...() call
powei 2013/07/24 02:28:29 Done.
+ void set_thumb_ui_resource_id(UIResourceId id);
+
protected:
ScrollbarLayerImpl(LayerTreeImpl* tree_impl,
int id,
@@ -82,9 +81,6 @@
gfx::Rect ScrollbarLayerRectToContentRect(gfx::RectF layer_rect) const;
- ResourceProvider::ResourceId track_resource_id_;
- ResourceProvider::ResourceId thumb_resource_id_;
-
float current_pos_;
int maximum_;
int thumb_thickness_;
@@ -101,6 +97,9 @@
int scroll_layer_id_;
+ UIResourceId track_ui_resource_id_;
+ UIResourceId thumb_ui_resource_id_;
+
bool is_scrollable_area_active_;
bool is_scroll_view_scrollbar_;
bool enabled_;

Powered by Google App Engine
This is Rietveld 408576698