Update from https://crrev.com/309717

skia/ext/bitmap_platform_device_cairo.h

Index: skia/ext/bitmap_platform_device_cairo.h
diff --git a/skia/ext/bitmap_platform_device_cairo.h b/skia/ext/bitmap_platform_device_cairo.h
index 938dd159103b98a26452b63bf84b702e8cd1f670..977cdad7d9e955e51633c5bf96b52c822c35b0a5 100644
--- a/skia/ext/bitmap_platform_device_cairo.h
+++ b/skia/ext/bitmap_platform_device_cairo.h
@@ -65,7 +65,7 @@ class BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice {
   //
   // 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
@@ -84,15 +84,15 @@ class BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice {
                                       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,