Update from https://crrev.com/309717

skia/ext/bitmap_platform_device_cairo.h

 // Copyright 2013 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 SKIA_EXT_BITMAP_PLATFORM_DEVICE_CAIRO_H_
 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_CAIRO_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
@@ skipping 47 matching lines @@
 // -----------------------------------------------------------------------------
 class BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice {
  public:
   // Create a BitmapPlatformDeviceLinux from an already constructed bitmap;
   // you should probably be using Create(). This may become private later if
   // we ever have to share state between some native drawing UI and Skia, like
   // the Windows and Mac versions of this class do.
   //
   // This object takes ownership of @cairo.
   BitmapPlatformDevice(const SkBitmap& other, cairo_t* cairo);
-  virtual ~BitmapPlatformDevice();
+  ~BitmapPlatformDevice() override;
 
   // Constructs a device with size |width| * |height| with contents initialized
   // to zero. |is_opaque| should be set if the caller knows the bitmap will be
   // completely opaque and allows some optimizations.
   static BitmapPlatformDevice* Create(int width, int height, bool is_opaque);
 
   // Performs the same construction as Create.
   // Other ports require a separate construction routine because Create does not
   // initialize the bitmap to 0.
   static BitmapPlatformDevice* CreateAndClear(int width, int height,
                                               bool is_opaque);
 
   // This doesn't take ownership of |data|. If |data| is NULL, the contents
   // of the device are initialized to 0.
   static BitmapPlatformDevice* Create(int width, int height, bool is_opaque,
                                       uint8_t* data);
 
   // Overridden from SkBaseDevice:
-  virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
-                             const SkClipStack&) override;
+  void setMatrixClip(const SkMatrix& transform,
+                     const SkRegion& region,
+                     const SkClipStack&) override;
 
   // Overridden from PlatformDevice:
-  virtual cairo_t* BeginPlatformPaint() override;
+  cairo_t* BeginPlatformPaint() override;
 
  protected:
-  virtual SkBaseDevice* onCreateCompatibleDevice(const CreateInfo& info)
-    override;
+  SkBaseDevice* onCreateCompatibleDevice(const CreateInfo& info) override;
 
  private:
   static BitmapPlatformDevice* Create(int width, int height, bool is_opaque,
                                       cairo_surface_t* surface);
 
   // Sets the transform and clip operations. This will not update the Cairo
   // context, but will mark the config as dirty. The next call of LoadConfig
   // will pick up these changes.
   void SetMatrixClip(const SkMatrix& transform, const SkRegion& region);
 
@@ skipping 15 matching lines @@
 
   // The current clipping
   SkRegion clip_region_;
 
   DISALLOW_COPY_AND_ASSIGN(BitmapPlatformDevice);
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_BITMAP_PLATFORM_DEVICE_CAIRO_H_