Update from https://crrev.com/309717

cc/resources/filter_display_item.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_RESOURCES_FILTER_DISPLAY_ITEM_H_
 #define CC_RESOURCES_FILTER_DISPLAY_ITEM_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/resources/display_item.h"
 #include "skia/ext/refptr.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 class SkCanvas;
 class SkDrawPictureCallback;
 class SkImageFilter;
 
 namespace cc {
 
 class CC_EXPORT FilterDisplayItem : public DisplayItem {
  public:
-  virtual ~FilterDisplayItem();
+  ~FilterDisplayItem() override;
 
   static scoped_ptr<FilterDisplayItem> Create(
       skia::RefPtr<SkImageFilter> filter,
       gfx::RectF bounds) {
     return make_scoped_ptr(new FilterDisplayItem(filter, bounds));
   }
 
   void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override;
 
   bool IsSuitableForGpuRasterization() const override;
   int ApproximateOpCount() const override;
   size_t PictureMemoryUsage() const override;
 
  protected:
   FilterDisplayItem(skia::RefPtr<SkImageFilter> filter, gfx::RectF bounds);
 
  private:
   skia::RefPtr<SkImageFilter> filter_;
   gfx::RectF bounds_;
 };
 
 class CC_EXPORT EndFilterDisplayItem : public DisplayItem {
  public:
-  virtual ~EndFilterDisplayItem();
+  ~EndFilterDisplayItem() override;
 
   static scoped_ptr<EndFilterDisplayItem> Create() {
     return make_scoped_ptr(new EndFilterDisplayItem());
   }
 
   void Raster(SkCanvas* canvas, SkDrawPictureCallback* callback) const override;
 
   bool IsSuitableForGpuRasterization() const override;
   int ApproximateOpCount() const override;
   size_t PictureMemoryUsage() const override;
 
  protected:
   EndFilterDisplayItem();
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_FILTER_DISPLAY_ITEM_H_