UI Resource Manager

cc/layers/scrollbar_layer_impl.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_LAYERS_SCROLLBAR_LAYER_IMPL_H_
 #define CC_LAYERS_SCROLLBAR_LAYER_IMPL_H_
 
 #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 {
 
 class LayerTreeImpl;
 class ScrollView;
 
 class CC_EXPORT ScrollbarLayerImpl : public LayerImpl {
  public:
   static scoped_ptr<ScrollbarLayerImpl> Create(
       LayerTreeImpl* tree_impl,
@@ skipping 29 matching lines @@
   }
   void set_track_start(int track_start) {
     track_start_ = track_start;
   }
   void set_track_length(int track_length) {
     track_length_ = track_length;
   }
   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;
   }
 
   void SetCurrentPos(float current_pos) { current_pos_ = current_pos; }
   void SetMaximum(int maximum) { maximum_ = maximum; }
 
   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_...() calls.

[powei, 2013/07/24 02:28:29]

Done.

+  void set_thumb_ui_resource_id(UIResourceId id);
+
  protected:
   ScrollbarLayerImpl(LayerTreeImpl* tree_impl,
                      int id,
                      ScrollbarOrientation orientation);
 
  private:
   virtual const char* LayerTypeAsString() const OVERRIDE;
 
   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_;
   int thumb_length_;
   int track_start_;
   int track_length_;
   ScrollbarOrientation orientation_;
 
   // Difference between the clip layer's height and the visible viewport
   // height (which may differ in the presence of top-controls hiding).
   float vertical_adjust_;
 
   float visible_to_total_length_ratio_;
 
   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_;
   bool is_custom_scrollbar_;
   bool is_overlay_scrollbar_;
 
   DISALLOW_COPY_AND_ASSIGN(ScrollbarLayerImpl);
 };
 
 }  // namespace cc
 #endif  // CC_LAYERS_SCROLLBAR_LAYER_IMPL_H_