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

Side by Side Diff: skia/ext/bitmap_platform_device_mac.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_cairo.h ('k') | skia/ext/bitmap_platform_device_skia.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_MAC_H_ 5 #ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_
6 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_ 6 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "skia/ext/platform_device.h" 10 #include "skia/ext/platform_device.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 44
45 // Creates a context for |data| and calls Create. 45 // Creates a context for |data| and calls Create.
46 // If |data| is NULL, then the bitmap backing store is not initialized. 46 // If |data| is NULL, then the bitmap backing store is not initialized.
47 static BitmapPlatformDevice* CreateWithData(uint8_t* data, 47 static BitmapPlatformDevice* CreateWithData(uint8_t* data,
48 int width, int height, 48 int width, int height,
49 bool is_opaque); 49 bool is_opaque);
50 50
51 virtual ~BitmapPlatformDevice(); 51 virtual ~BitmapPlatformDevice();
52 52
53 // PlatformDevice overrides 53 // PlatformDevice overrides
54 virtual CGContextRef GetBitmapContext() OVERRIDE; 54 virtual CGContextRef GetBitmapContext() override;
55 virtual void DrawToNativeContext(CGContextRef context, int x, int y, 55 virtual void DrawToNativeContext(CGContextRef context, int x, int y,
56 const CGRect* src_rect) OVERRIDE; 56 const CGRect* src_rect) override;
57 57
58 // SkBaseDevice overrides 58 // SkBaseDevice overrides
59 virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region, 59 virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
60 const SkClipStack&) OVERRIDE; 60 const SkClipStack&) override;
61 61
62 protected: 62 protected:
63 BitmapPlatformDevice(CGContextRef context, 63 BitmapPlatformDevice(CGContextRef context,
64 const SkBitmap& bitmap); 64 const SkBitmap& bitmap);
65 65
66 virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info, 66 virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info,
67 Usage usage) OVERRIDE; 67 Usage usage) override;
68 68
69 private: 69 private:
70 void ReleaseBitmapContext(); 70 void ReleaseBitmapContext();
71 71
72 // Sets the transform and clip operations. This will not update the CGContext, 72 // Sets the transform and clip operations. This will not update the CGContext,
73 // but will mark the config as dirty. The next call of LoadConfig will 73 // but will mark the config as dirty. The next call of LoadConfig will
74 // pick up these changes. 74 // pick up these changes.
75 void SetMatrixClip(const SkMatrix& transform, const SkRegion& region); 75 void SetMatrixClip(const SkMatrix& transform, const SkRegion& region);
76 76
77 // Loads the current transform and clip into the context. Can be called even 77 // Loads the current transform and clip into the context. Can be called even
(...skipping 14 matching lines...) Expand all
92 SkMatrix transform_; 92 SkMatrix transform_;
93 93
94 // The current clipping 94 // The current clipping
95 SkRegion clip_region_; 95 SkRegion clip_region_;
96 DISALLOW_COPY_AND_ASSIGN(BitmapPlatformDevice); 96 DISALLOW_COPY_AND_ASSIGN(BitmapPlatformDevice);
97 }; 97 };
98 98
99 } // namespace skia 99 } // namespace skia
100 100
101 #endif // SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_ 101 #endif // SKIA_EXT_BITMAP_PLATFORM_DEVICE_MAC_H_
OLDNEW
« no previous file with comments | « skia/ext/bitmap_platform_device_cairo.h ('k') | skia/ext/bitmap_platform_device_skia.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698