diff options
| -rw-r--r-- | skia/ext/bitmap_platform_device_cairo.h | 12 | ||||
| -rw-r--r-- | skia/ext/pixel_ref_utils_unittest.cc | 10 |
2 files changed, 15 insertions, 7 deletions
diff --git a/skia/ext/bitmap_platform_device_cairo.h b/skia/ext/bitmap_platform_device_cairo.h index 938dd15..977cdad 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, diff --git a/skia/ext/pixel_ref_utils_unittest.cc b/skia/ext/pixel_ref_utils_unittest.cc index 08e5d3e..414a3ce 100644 --- a/skia/ext/pixel_ref_utils_unittest.cc +++ b/skia/ext/pixel_ref_utils_unittest.cc @@ -47,7 +47,15 @@ class TestDiscardableShader : public SkShader { void flatten(SkWriteBuffer&) const override {} - SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(TestDiscardableShader); + // Manual expansion of SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS to + // satisfy Chrome's style checker, since Skia isn't ready to make the C++11 + // leap yet. + private: + static SkFlattenable* CreateProc(SkReadBuffer&); + friend class SkPrivateEffectInitializer; + + public: + Factory getFactory() const override { return CreateProc; } private: SkBitmap bitmap_; |