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

Side by Side Diff: skia/ext/bitmap_platform_device_cairo.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/benchmarking_canvas.cc ('k') | skia/ext/bitmap_platform_device_mac.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_CAIRO_H_ 5 #ifndef SKIA_EXT_BITMAP_PLATFORM_DEVICE_CAIRO_H_
6 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_CAIRO_H_ 6 #define SKIA_EXT_BITMAP_PLATFORM_DEVICE_CAIRO_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 "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 static BitmapPlatformDevice* CreateAndClear(int width, int height, 78 static BitmapPlatformDevice* CreateAndClear(int width, int height,
79 bool is_opaque); 79 bool is_opaque);
80 80
81 // This doesn't take ownership of |data|. If |data| is NULL, the contents 81 // This doesn't take ownership of |data|. If |data| is NULL, the contents
82 // of the device are initialized to 0. 82 // of the device are initialized to 0.
83 static BitmapPlatformDevice* Create(int width, int height, bool is_opaque, 83 static BitmapPlatformDevice* Create(int width, int height, bool is_opaque,
84 uint8_t* data); 84 uint8_t* data);
85 85
86 // Overridden from SkBaseDevice: 86 // Overridden from SkBaseDevice:
87 virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region, 87 virtual void setMatrixClip(const SkMatrix& transform, const SkRegion& region,
88 const SkClipStack&) OVERRIDE; 88 const SkClipStack&) override;
89 89
90 // Overridden from PlatformDevice: 90 // Overridden from PlatformDevice:
91 virtual cairo_t* BeginPlatformPaint() OVERRIDE; 91 virtual cairo_t* BeginPlatformPaint() override;
92 virtual void DrawToNativeContext(PlatformSurface surface, int x, int y, 92 virtual void DrawToNativeContext(PlatformSurface surface, int x, int y,
93 const PlatformRect* src_rect) OVERRIDE; 93 const PlatformRect* src_rect) override;
94 94
95 protected: 95 protected:
96 virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info, 96 virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info,
97 Usage usage) OVERRIDE; 97 Usage usage) override;
98 98
99 private: 99 private:
100 static BitmapPlatformDevice* Create(int width, int height, bool is_opaque, 100 static BitmapPlatformDevice* Create(int width, int height, bool is_opaque,
101 cairo_surface_t* surface); 101 cairo_surface_t* surface);
102 102
103 // Sets the transform and clip operations. This will not update the Cairo 103 // Sets the transform and clip operations. This will not update the Cairo
104 // context, but will mark the config as dirty. The next call of LoadConfig 104 // context, but will mark the config as dirty. The next call of LoadConfig
105 // will pick up these changes. 105 // will pick up these changes.
106 void SetMatrixClip(const SkMatrix& transform, const SkRegion& region); 106 void SetMatrixClip(const SkMatrix& transform, const SkRegion& region);
107 107
(...skipping 15 matching lines...) Expand all
123 123
124 // The current clipping 124 // The current clipping
125 SkRegion clip_region_; 125 SkRegion clip_region_;
126 126
127 DISALLOW_COPY_AND_ASSIGN(BitmapPlatformDevice); 127 DISALLOW_COPY_AND_ASSIGN(BitmapPlatformDevice);
128 }; 128 };
129 129
130 } // namespace skia 130 } // namespace skia
131 131
132 #endif // SKIA_EXT_BITMAP_PLATFORM_DEVICE_CAIRO_H_ 132 #endif // SKIA_EXT_BITMAP_PLATFORM_DEVICE_CAIRO_H_
OLDNEW
« no previous file with comments | « skia/ext/benchmarking_canvas.cc ('k') | skia/ext/bitmap_platform_device_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698