Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: skia/ext/bitmap_platform_device_skia.h

Issue 641523002: Replace OVERRIDE with its C++11 counterparts in src/skia (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « skia/ext/bitmap_platform_device_mac.h ('k') | skia/ext/bitmap_platform_device_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_SKIA_H_ 5 #ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_SKIA_H_
6 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_SKIA_H_ 6 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_SKIA_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "skia/ext/platform_device.h" 10 #include "skia/ext/platform_device.h"
(...skipping 24 matching lines...) Expand all
35 static BitmapPlatformDevice* Create(int width, int height, bool is_opaque, 35 static BitmapPlatformDevice* Create(int width, int height, bool is_opaque,
36 uint8_t* data); 36 uint8_t* data);
37 37
38 // Create a BitmapPlatformDevice from an already constructed bitmap; 38 // Create a BitmapPlatformDevice from an already constructed bitmap;
39 // you should probably be using Create(). This may become private later if 39 // you should probably be using Create(). This may become private later if
40 // we ever have to share state between some native drawing UI and Skia, like 40 // we ever have to share state between some native drawing UI and Skia, like
41 // the Windows and Mac versions of this class do. 41 // the Windows and Mac versions of this class do.
42 explicit BitmapPlatformDevice(const SkBitmap& other); 42 explicit BitmapPlatformDevice(const SkBitmap& other);
43 virtual ~BitmapPlatformDevice(); 43 virtual ~BitmapPlatformDevice();
44 44
45 virtual PlatformSurface BeginPlatformPaint() OVERRIDE; 45 virtual PlatformSurface BeginPlatformPaint() override;
46 virtual void DrawToNativeContext(PlatformSurface surface, int x, int y, 46 virtual void DrawToNativeContext(PlatformSurface surface, int x, int y,
47 const PlatformRect* src_rect) OVERRIDE; 47 const PlatformRect* src_rect) override;
48 48
49 protected: 49 protected:
50 virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info, 50 virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info,
51 Usage usage) OVERRIDE; 51 Usage usage) override;
52 52
53 private: 53 private:
54 DISALLOW_COPY_AND_ASSIGN(BitmapPlatformDevice); 54 DISALLOW_COPY_AND_ASSIGN(BitmapPlatformDevice);
55 }; 55 };
56 56
57 } // namespace skia 57 } // namespace skia
58 58
59 #endif // SKIA_EXT_BITMAP_PLATFORM_DEVICE_SKIA_H_ 59 #endif // SKIA_EXT_BITMAP_PLATFORM_DEVICE_SKIA_H_
OLDNEW
« no previous file with comments | « skia/ext/bitmap_platform_device_mac.h ('k') | skia/ext/bitmap_platform_device_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698