Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3035)

Unified Diff: cc/layers/texture_layer.h

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/surface_layer_impl.h ('k') | cc/layers/texture_layer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/texture_layer.h
diff --git a/cc/layers/texture_layer.h b/cc/layers/texture_layer.h
index 22dcb4d41a567d1584fb892a7bba61137f817312..735fed9b5aa3f99ab9a2bb809e7757f05ea5b8df 100644
--- a/cc/layers/texture_layer.h
+++ b/cc/layers/texture_layer.h
@@ -95,7 +95,7 @@ class CC_EXPORT TextureLayer : public Layer {
void ClearTexture();
virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
- OVERRIDE;
+ override;
// Sets whether this texture should be Y-flipped at draw time. Defaults to
// true.
@@ -134,18 +134,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::RectF& dirty_rect) OVERRIDE;
+ virtual void SetNeedsDisplayRect(const gfx::RectF& dirty_rect) override;
- virtual void SetLayerTreeHost(LayerTreeHost* layer_tree_host) 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;
+ const OcclusionTracker<Layer>* occlusion) override;
+ virtual void PushPropertiesTo(LayerImpl* layer) override;
+ virtual SimpleEnclosedRegion VisibleContentOpaqueRegion() const override;
protected:
explicit TextureLayer(TextureLayerClient* client);
virtual ~TextureLayer();
- virtual bool HasDrawableContent() const OVERRIDE;
+ virtual bool HasDrawableContent() const override;
private:
void SetTextureMailboxInternal(
« no previous file with comments | « cc/layers/surface_layer_impl.h ('k') | cc/layers/texture_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698