diff options
author | dcheng <dcheng@chromium.org> | 2015-04-20 22:14:38 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-21 05:14:42 +0000 |
commit | 98a2105e09e19d92300270853a7bdbccaca4a121 (patch) | |
tree | 953630f7d381417f93418907a7e6efeac10df5d3 /skia/ext | |
parent | 67362f0169457bde9a03440dfc304426e7c2350b (diff) | |
download | chromium_src-98a2105e09e19d92300270853a7bdbccaca4a121.zip chromium_src-98a2105e09e19d92300270853a7bdbccaca4a121.tar.gz chromium_src-98a2105e09e19d92300270853a7bdbccaca4a121.tar.bz2 |
Apply automated fixits for Chrome clang plugin to ui_base_unittests.
Working on trimming down plugin warnings on the Windows clang build.
BUG=467287
Review URL: https://codereview.chromium.org/1096213002
Cr-Commit-Position: refs/heads/master@{#325983}
Diffstat (limited to 'skia/ext')
-rw-r--r-- | skia/ext/bitmap_platform_device_win.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/skia/ext/bitmap_platform_device_win.h b/skia/ext/bitmap_platform_device_win.h index 4a8ad8f..8acfd42 100644 --- a/skia/ext/bitmap_platform_device_win.h +++ b/skia/ext/bitmap_platform_device_win.h @@ -42,18 +42,19 @@ class SK_API BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice // initialized to 0. static BitmapPlatformDevice* Create(int width, int height, bool is_opaque); - virtual ~BitmapPlatformDevice(); + ~BitmapPlatformDevice() override; // PlatformDevice overrides // Retrieves the bitmap DC, which is the memory DC for our bitmap data. The // bitmap DC is lazy created. - virtual PlatformSurface BeginPlatformPaint() override; - virtual void EndPlatformPaint() override; + PlatformSurface BeginPlatformPaint() override; + void EndPlatformPaint() override; // Loads the given transform and clipping region into the HDC. This is // 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; void DrawToHDC(HDC dc, int x, int y, const RECT* src_rect) override; @@ -61,7 +62,7 @@ class SK_API BitmapPlatformDevice : public SkBitmapDevice, public PlatformDevice // Flushes the Windows device context so that the pixel data can be accessed // directly by Skia. Overridden from SkBaseDevice, this is called when Skia // starts accessing pixel data. - virtual const SkBitmap& onAccessBitmap() override; + const SkBitmap& onAccessBitmap() override; SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override; |