UI Resource Manager

cc/layers/scrollbar_layer.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_H_
 #define CC_LAYERS_SCROLLBAR_LAYER_H_
 
 #include "cc/base/cc_export.h"
 #include "cc/input/scrollbar.h"
 #include "cc/layers/contents_scaling_layer.h"
 #include "cc/layers/scrollbar_theme_painter.h"
 #include "cc/resources/layer_updater.h"
+#include "cc/resources/ui_resource_manager.h"
 
 namespace cc {
-class CachingBitmapContentLayerUpdater;
 class ResourceUpdateQueue;

[aelias_OOO_until_Jul13, 2013/07/10 23:07:22]

Also delete this.

[powei, 2013/07/11 23:54:44]

Done.

 class ScrollbarThemeComposite;
 
-class CC_EXPORT ScrollbarLayer : public ContentsScalingLayer {
+class CC_EXPORT ScrollbarLayer : public ContentsScalingLayer,
+  public UIResourceManagerClient {

[aelias_OOO_until_Jul13, 2013/07/10 23:07:22]

nit: wrong spacing

[powei, 2013/07/11 23:54:44]

Done.

  public:
   virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
       OVERRIDE;
 
   static scoped_refptr<ScrollbarLayer> Create(
       scoped_ptr<Scrollbar> scrollbar,
       int scroll_layer_id);
 
   int scroll_layer_id() const { return scroll_layer_id_; }
   void SetScrollLayerId(int id);
 
   virtual bool OpacityCanAnimateOnImplThread() const OVERRIDE;
 
   ScrollbarOrientation Orientation() const;
 
   // Layer interface
-  virtual void SetTexturePriorities(const PriorityCalculator& priority_calc)
-      OVERRIDE;
   virtual void Update(ResourceUpdateQueue* queue,

[aelias_OOO_until_Jul13, 2013/07/10 23:07:22]

This should be deleted.

[powei, 2013/07/11 23:54:44]

Isn't this function where the bitmaps are generated?  If not here, then where
should the texture updates go? 

[aelias_OOO_until_Jul13, 2013/07/12 00:52:27]

This function is tied to the legacy PrioritizedResourceManager system, that's
why we should delete it.

I believe the only reason to reraster scrollbars is when contents scale changes.
 So you could trigger raster at the end of CalculateContentsScale (after
checking that resulted in a change from the previous value).

                       const OcclusionTracker* occlusion) OVERRIDE;
   virtual void SetLayerTreeHost(LayerTreeHost* host) OVERRIDE;
   virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
   virtual void CalculateContentsScale(float ideal_contents_scale,
                                       float device_scale_factor,
                                       float page_scale_factor,
                                       bool animating_transform_to_screen,
                                       float* contents_scale_x,
                                       float* contents_scale_y,
                                       gfx::Size* content_bounds) OVERRIDE;
 
   virtual ScrollbarLayer* ToScrollbarLayer() OVERRIDE;
 
+  virtual void UIResourceReady(UIResourceId id) OVERRIDE;

[aelias_OOO_until_Jul13, 2013/07/10 23:07:22]

No need for this here, it should have an empty implementation in the base class.

[powei, 2013/07/11 23:54:44]

Done.

+
  protected:
   ScrollbarLayer(scoped_ptr<Scrollbar> scrollbar,
                  int scroll_layer_id);
   virtual ~ScrollbarLayer();
 
  private:
-  void 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);
 
   scoped_ptr<Scrollbar> scrollbar_;
 
   int thumb_thickness_;
   int thumb_length_;
   gfx::Rect track_rect_;
   int scroll_layer_id_;
 
-  unsigned texture_format_;
-
   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_;
+  UIResourceId track_ui_resource_id_;
+  UIResourceId thumb_ui_resource_id_;
+  scoped_refptr<UIResourceBitmap> track_bitmap_;
+  scoped_refptr<UIResourceBitmap> thumb_bitmap_;
+  bool skip_update_;

[aelias_OOO_until_Jul13, 2013/07/10 23:07:22]

It doesn't look like this variable does anything useful, please delete it.

[powei, 2013/07/11 23:54:44]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(ScrollbarLayer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_SCROLLBAR_LAYER_H_