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

Side by Side Diff: include/effects/SkTransparentShader.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 8 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 | « include/effects/SkTileImageFilter.h ('k') | include/effects/SkXfermodeImageFilter.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 /* 1 /*
2 * Copyright 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkTransparentShader_DEFINED 8 #ifndef SkTransparentShader_DEFINED
9 #define SkTransparentShader_DEFINED 9 #define SkTransparentShader_DEFINED
10 10
11 #include "SkShader.h" 11 #include "SkShader.h"
12 12
13 class SK_API SkTransparentShader : public SkShader { 13 class SK_API SkTransparentShader : public SkShader {
14 public: 14 public:
15 SkTransparentShader() {} 15 SkTransparentShader() {}
16 16
17 size_t contextSize() const SK_OVERRIDE; 17 size_t contextSize() const override;
18 18
19 class TransparentShaderContext : public SkShader::Context { 19 class TransparentShaderContext : public SkShader::Context {
20 public: 20 public:
21 TransparentShaderContext(const SkTransparentShader& shader, const Contex tRec&); 21 TransparentShaderContext(const SkTransparentShader& shader, const Contex tRec&);
22 virtual ~TransparentShaderContext(); 22 virtual ~TransparentShaderContext();
23 23
24 uint32_t getFlags() const SK_OVERRIDE; 24 uint32_t getFlags() const override;
25 void shadeSpan(int x, int y, SkPMColor[], int count) SK_OVERRIDE; 25 void shadeSpan(int x, int y, SkPMColor[], int count) override;
26 void shadeSpan16(int x, int y, uint16_t span[], int count) SK_OVERRIDE; 26 void shadeSpan16(int x, int y, uint16_t span[], int count) override;
27 27
28 private: 28 private:
29 const SkBitmap* fDevice; 29 const SkBitmap* fDevice;
30 30
31 typedef SkShader::Context INHERITED; 31 typedef SkShader::Context INHERITED;
32 }; 32 };
33 33
34 SK_TO_STRING_OVERRIDE() 34 SK_TO_STRING_OVERRIDE()
35 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTransparentShader) 35 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkTransparentShader)
36 36
37 protected: 37 protected:
38 Context* onCreateContext(const ContextRec&, void* storage) const SK_OVERRIDE ; 38 Context* onCreateContext(const ContextRec&, void* storage) const override;
39 39
40 // we don't need to flatten anything at all 40 // we don't need to flatten anything at all
41 void flatten(SkWriteBuffer&) const SK_OVERRIDE {} 41 void flatten(SkWriteBuffer&) const override {}
42 42
43 private: 43 private:
44 typedef SkShader INHERITED; 44 typedef SkShader INHERITED;
45 }; 45 };
46 46
47 #endif 47 #endif
OLDNEW
« no previous file with comments | « include/effects/SkTileImageFilter.h ('k') | include/effects/SkXfermodeImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698