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

Unified Diff: cc/layers/image_layer.h

Issue 645853008: Standardize usage of virtual/override/final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formatted 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/heads_up_display_unittest.cc ('k') | cc/layers/io_surface_layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « cc/layers/heads_up_display_unittest.cc ('k') | cc/layers/io_surface_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698