| Index: cc/scrollbar_layer.h
|
| diff --git a/cc/scrollbar_layer.h b/cc/scrollbar_layer.h
|
| index 95847a963ff9db454bbf938e18c5581b90a6bf86..0120387c67bf38f9f251ef8c5aa4215befce9f3f 100644
|
| --- a/cc/scrollbar_layer.h
|
| +++ b/cc/scrollbar_layer.h
|
| @@ -6,8 +6,8 @@
|
| #ifndef ScrollbarLayerChromium_h
|
| #define ScrollbarLayerChromium_h
|
|
|
| -#include "caching_bitmap_content_layer_updater.h"
|
| -#include "cc/layer.h"
|
| +#include "cc/caching_bitmap_content_layer_updater.h"
|
| +#include "cc/contents_scaling_layer.h"
|
| #include <public/WebScrollbar.h>
|
| #include <public/WebScrollbarThemeGeometry.h>
|
| #include <public/WebScrollbarThemePainter.h>
|
| @@ -18,15 +18,13 @@ class ResourceUpdateQueue;
|
| class Scrollbar;
|
| class ScrollbarThemeComposite;
|
|
|
| -class ScrollbarLayer : public Layer {
|
| +class ScrollbarLayer : public ContentsScalingLayer {
|
| public:
|
| virtual scoped_ptr<LayerImpl> createLayerImpl() OVERRIDE;
|
|
|
| static scoped_refptr<ScrollbarLayer> create(scoped_ptr<WebKit::WebScrollbar>, WebKit::WebScrollbarThemePainter, scoped_ptr<WebKit::WebScrollbarThemeGeometry>, int scrollLayerId);
|
|
|
| // Layer interface
|
| - virtual bool needsContentsScale() const OVERRIDE;
|
| - virtual IntSize contentBounds() const OVERRIDE;
|
| virtual void setTexturePriorities(const PriorityCalculator&) OVERRIDE;
|
| virtual void update(ResourceUpdateQueue&, const OcclusionTracker*, RenderingStats&) OVERRIDE;
|
| virtual void setLayerTreeHost(LayerTreeHost*) OVERRIDE;
|
|
|