| Index: cc/layers/texture_layer.h
|
| diff --git a/cc/layers/texture_layer.h b/cc/layers/texture_layer.h
|
| index 61791ac141bb63230fc3a3e2200e25219024a673..fa52a8c11ff20b5df8d84c71fc283354910a46a6 100644
|
| --- a/cc/layers/texture_layer.h
|
| +++ b/cc/layers/texture_layer.h
|
| @@ -94,8 +94,7 @@ class CC_EXPORT TextureLayer : public Layer {
|
| // Resets the texture.
|
| void ClearTexture();
|
|
|
| - virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
|
| - override;
|
| + scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
|
|
|
| // Sets whether this texture should be Y-flipped at draw time. Defaults to
|
| // true.
|
| @@ -134,18 +133,18 @@ class CC_EXPORT TextureLayer : public Layer {
|
| // TODO(danakj): Remove this when pepper doesn't need it. crbug.com/350204
|
| void SetTextureMailboxWithoutReleaseCallback(const TextureMailbox& mailbox);
|
|
|
| - virtual void SetNeedsDisplayRect(const gfx::Rect& dirty_rect) override;
|
| + void SetNeedsDisplayRect(const gfx::Rect& dirty_rect) override;
|
|
|
| - virtual void SetLayerTreeHost(LayerTreeHost* layer_tree_host) override;
|
| - virtual bool Update(ResourceUpdateQueue* queue,
|
| - const OcclusionTracker<Layer>* occlusion) override;
|
| - virtual void PushPropertiesTo(LayerImpl* layer) override;
|
| - virtual SimpleEnclosedRegion VisibleContentOpaqueRegion() const override;
|
| + void SetLayerTreeHost(LayerTreeHost* layer_tree_host) override;
|
| + bool Update(ResourceUpdateQueue* queue,
|
| + const OcclusionTracker<Layer>* occlusion) override;
|
| + void PushPropertiesTo(LayerImpl* layer) override;
|
| + SimpleEnclosedRegion VisibleContentOpaqueRegion() const override;
|
|
|
| protected:
|
| explicit TextureLayer(TextureLayerClient* client);
|
| - virtual ~TextureLayer();
|
| - virtual bool HasDrawableContent() const override;
|
| + ~TextureLayer() override;
|
| + bool HasDrawableContent() const override;
|
|
|
| private:
|
| void SetTextureMailboxInternal(
|
|
|