| Index: cc/layers/image_layer.h
|
| diff --git a/cc/layers/image_layer.h b/cc/layers/image_layer.h
|
| index 53d1f692f1a6002825466af39fee2ba0c19ee6a0..ed2a2a3bd89736159c5c0f7079b8864f9e8993da 100644
|
| --- a/cc/layers/image_layer.h
|
| +++ b/cc/layers/image_layer.h
|
| @@ -19,28 +19,27 @@ class CC_EXPORT ImageLayer : public TiledLayer {
|
| static scoped_refptr<ImageLayer> Create();
|
|
|
| // Layer implementation.
|
| - virtual void SetTexturePriorities(const PriorityCalculator& priority_calc)
|
| - override;
|
| - virtual bool Update(ResourceUpdateQueue* queue,
|
| - const OcclusionTracker<Layer>* occlusion) override;
|
| - virtual void CalculateContentsScale(float ideal_contents_scale,
|
| - float* contents_scale_x,
|
| - float* contents_scale_y,
|
| - gfx::Size* content_bounds) override;
|
| - virtual void OnOutputSurfaceCreated() override;
|
| + void SetTexturePriorities(const PriorityCalculator& priority_calc) override;
|
| + bool Update(ResourceUpdateQueue* queue,
|
| + const OcclusionTracker<Layer>* occlusion) override;
|
| + void CalculateContentsScale(float ideal_contents_scale,
|
| + float* contents_scale_x,
|
| + float* contents_scale_y,
|
| + gfx::Size* content_bounds) override;
|
| + void OnOutputSurfaceCreated() override;
|
|
|
| void SetBitmap(const SkBitmap& image);
|
|
|
| protected:
|
| - virtual bool HasDrawableContent() const override;
|
| + bool HasDrawableContent() const override;
|
|
|
| private:
|
| ImageLayer();
|
| - virtual ~ImageLayer();
|
| + ~ImageLayer() override;
|
|
|
| // TiledLayer Implementation.
|
| - virtual LayerUpdater* Updater() const override;
|
| - virtual void CreateUpdaterIfNeeded() override;
|
| + LayerUpdater* Updater() const override;
|
| + void CreateUpdaterIfNeeded() override;
|
|
|
| float ImageContentsScaleX() const;
|
| float ImageContentsScaleY() const;
|
|
|