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

Side by Side Diff: include/effects/SkDisplacementMapEffect.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, 9 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/SkDiscretePathEffect.h ('k') | include/effects/SkDropShadowImageFilter.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 2013 Google Inc. 2 * Copyright 2013 Google Inc.
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 SkDisplacementMapEffect_DEFINED 8 #ifndef SkDisplacementMapEffect_DEFINED
9 #define SkDisplacementMapEffect_DEFINED 9 #define SkDisplacementMapEffect_DEFINED
10 10
(...skipping 17 matching lines...) Expand all
28 SkScalar scale, SkImageFilter* displa cement, 28 SkScalar scale, SkImageFilter* displa cement,
29 SkImageFilter* color = NULL, 29 SkImageFilter* color = NULL,
30 const CropRect* cropRect = NULL); 30 const CropRect* cropRect = NULL);
31 31
32 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDisplacementMapEffect) 32 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDisplacementMapEffect)
33 33
34 virtual bool onFilterImage(Proxy* proxy, 34 virtual bool onFilterImage(Proxy* proxy,
35 const SkBitmap& src, 35 const SkBitmap& src,
36 const Context& ctx, 36 const Context& ctx,
37 SkBitmap* dst, 37 SkBitmap* dst,
38 SkIPoint* offset) const SK_OVERRIDE; 38 SkIPoint* offset) const override;
39 void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE; 39 void computeFastBounds(const SkRect& src, SkRect* dst) const override;
40 40
41 virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&, 41 virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
42 SkIRect* dst) const SK_OVERRIDE; 42 SkIRect* dst) const override;
43 43
44 #if SK_SUPPORT_GPU 44 #if SK_SUPPORT_GPU
45 bool canFilterImageGPU() const SK_OVERRIDE { return true; } 45 bool canFilterImageGPU() const override { return true; }
46 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context & ctx, 46 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context & ctx,
47 SkBitmap* result, SkIPoint* offset) const SK_OVE RRIDE; 47 SkBitmap* result, SkIPoint* offset) const overri de;
48 #endif 48 #endif
49 49
50 SK_TO_STRING_OVERRIDE() 50 SK_TO_STRING_OVERRIDE()
51 51
52 protected: 52 protected:
53 SkDisplacementMapEffect(ChannelSelectorType xChannelSelector, 53 SkDisplacementMapEffect(ChannelSelectorType xChannelSelector,
54 ChannelSelectorType yChannelSelector, 54 ChannelSelectorType yChannelSelector,
55 SkScalar scale, SkImageFilter* inputs[2], 55 SkScalar scale, SkImageFilter* inputs[2],
56 const CropRect* cropRect); 56 const CropRect* cropRect);
57 void flatten(SkWriteBuffer&) const SK_OVERRIDE; 57 void flatten(SkWriteBuffer&) const override;
58 58
59 private: 59 private:
60 ChannelSelectorType fXChannelSelector; 60 ChannelSelectorType fXChannelSelector;
61 ChannelSelectorType fYChannelSelector; 61 ChannelSelectorType fYChannelSelector;
62 SkScalar fScale; 62 SkScalar fScale;
63 typedef SkImageFilter INHERITED; 63 typedef SkImageFilter INHERITED;
64 const SkImageFilter* getDisplacementInput() const { return getInput(0); } 64 const SkImageFilter* getDisplacementInput() const { return getInput(0); }
65 const SkImageFilter* getColorInput() const { return getInput(1); } 65 const SkImageFilter* getColorInput() const { return getInput(1); }
66 }; 66 };
67 67
68 #endif 68 #endif
OLDNEW
« no previous file with comments | « include/effects/SkDiscretePathEffect.h ('k') | include/effects/SkDropShadowImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698