UI Resource Manager

cc/layers/scrollbar_layer.h

Index: cc/layers/scrollbar_layer.h
===================================================================
--- cc/layers/scrollbar_layer.h	(revision 213304)
+++ cc/layers/scrollbar_layer.h	(working copy)
@@ -12,10 +12,11 @@
 #include "cc/resources/layer_updater.h"
 
 namespace cc {
-class CachingBitmapContentLayerUpdater;
-class ResourceUpdateQueue;
 class ScrollbarThemeComposite;
+class UIResourceBitmap;
 
+typedef int UIResourceId;
+
 class CC_EXPORT ScrollbarLayer : public ContentsScalingLayer {
  public:
   virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
@@ -33,8 +34,6 @@
   ScrollbarOrientation Orientation() const;
 
   // Layer interface
-  virtual void SetTexturePriorities(const PriorityCalculator& priority_calc)
-      OVERRIDE;
   virtual bool Update(ResourceUpdateQueue* queue,
                       const OcclusionTracker* occlusion) OVERRIDE;
   virtual void SetLayerTreeHost(LayerTreeHost* host) OVERRIDE;
@@ -55,37 +54,31 @@
   virtual ~ScrollbarLayer();
 
  private:
-  bool UpdatePart(CachingBitmapContentLayerUpdater* painter,
-                  LayerUpdater::Resource* resource,
-                  gfx::Rect rect,
-                  ResourceUpdateQueue* queue);
-  void CreateUpdaterIfNeeded();
   gfx::Rect ScrollbarLayerRectToContentRect(gfx::Rect layer_rect) const;
   gfx::Rect OriginThumbRect() const;
 
-  bool is_dirty() const { return !dirty_rect_.IsEmpty(); }
-
   int MaxTextureSize();
   float ClampScaleToMaxTextureSize(float scale);
 
+  void RasterizeTrackAndThumb();
+
+  // Callback functions for UI Resource Manager
+  scoped_refptr<UIResourceBitmap> GetTrackBitmap(bool resource_lost);
+  scoped_refptr<UIResourceBitmap> GetThumbBitmap(bool resource_lost);
+
   scoped_ptr<Scrollbar> scrollbar_;
 
   int thumb_thickness_;
   int thumb_length_;
   gfx::Rect track_rect_;
+  gfx::Rect thumb_rect_;
   int scroll_layer_id_;
 
-  unsigned texture_format_;
+  UIResourceId track_ui_resource_id_;

[aelias_OOO_until_Jul13, 2013/07/24 02:57:46]

I think we should contain these in a separate helper class that looks like:

class ScopedUIResource {
 public:
  ScopedUIResource() {}
  ScopedUIResource(LayerTreeHost* host, scoped_refptr<UIResourceBitmap> bitmap)
{ reset(host, bitmap); }
  ~ScopedUIResource() { clear(); }

  void clear();
  UIResourceID reset(LayerTreeHost* host, scoped_refptr<UIResourceBitmap>
bitmap);

  UIResourceID id() const { return id_; }
 private:
  UIResourceId id_;
  scoped_refptr<UIResourceBitmap> bitmap_;
  LayerTreeHost* host_;
};

This will be a common pattern for UIResource users and avoid leaks.

[powei, 2013/07/25 20:48:45]

Done.

+  UIResourceId thumb_ui_resource_id_;
+  scoped_refptr<UIResourceBitmap> track_bitmap_;
+  scoped_refptr<UIResourceBitmap> thumb_bitmap_;
 
-  gfx::RectF dirty_rect_;
-
-  scoped_refptr<CachingBitmapContentLayerUpdater> track_updater_;
-  scoped_refptr<CachingBitmapContentLayerUpdater> thumb_updater_;
-
-  // All the parts of the scrollbar except the thumb
-  scoped_ptr<LayerUpdater::Resource> track_;
-  scoped_ptr<LayerUpdater::Resource> thumb_;
-
   DISALLOW_COPY_AND_ASSIGN(ScrollbarLayer);
 };