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

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

Issue 806653007: Fix up all the easy virtual ... SK_OVERRIDE cases. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 5 years, 11 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 19 matching lines...) Expand all
30 const CropRect* cropRect = NULL, 30 const CropRect* cropRect = NULL,
31 uint32_t uniqueID = 0); 31 uint32_t uniqueID = 0);
32 32
33 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDisplacementMapEffect) 33 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDisplacementMapEffect)
34 34
35 virtual bool onFilterImage(Proxy* proxy, 35 virtual bool onFilterImage(Proxy* proxy,
36 const SkBitmap& src, 36 const SkBitmap& src,
37 const Context& ctx, 37 const Context& ctx,
38 SkBitmap* dst, 38 SkBitmap* dst,
39 SkIPoint* offset) const SK_OVERRIDE; 39 SkIPoint* offset) const SK_OVERRIDE;
40 virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVER RIDE; 40 void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
41 41
42 virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&, 42 virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
43 SkIRect* dst) const SK_OVERRIDE; 43 SkIRect* dst) const SK_OVERRIDE;
44 44
45 #if SK_SUPPORT_GPU 45 #if SK_SUPPORT_GPU
46 virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; } 46 bool canFilterImageGPU() const SK_OVERRIDE { return true; }
47 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context & ctx, 47 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context & ctx,
48 SkBitmap* result, SkIPoint* offset) const SK_OVE RRIDE; 48 SkBitmap* result, SkIPoint* offset) const SK_OVE RRIDE;
49 #endif 49 #endif
50 50
51 SK_TO_STRING_OVERRIDE() 51 SK_TO_STRING_OVERRIDE()
52 52
53 protected: 53 protected:
54 SkDisplacementMapEffect(ChannelSelectorType xChannelSelector, 54 SkDisplacementMapEffect(ChannelSelectorType xChannelSelector,
55 ChannelSelectorType yChannelSelector, 55 ChannelSelectorType yChannelSelector,
56 SkScalar scale, SkImageFilter* inputs[2], 56 SkScalar scale, SkImageFilter* inputs[2],
57 const CropRect* cropRect, 57 const CropRect* cropRect,
58 uint32_t uniqueID); 58 uint32_t uniqueID);
59 virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; 59 void flatten(SkWriteBuffer&) const SK_OVERRIDE;
60 60
61 private: 61 private:
62 ChannelSelectorType fXChannelSelector; 62 ChannelSelectorType fXChannelSelector;
63 ChannelSelectorType fYChannelSelector; 63 ChannelSelectorType fYChannelSelector;
64 SkScalar fScale; 64 SkScalar fScale;
65 typedef SkImageFilter INHERITED; 65 typedef SkImageFilter INHERITED;
66 const SkImageFilter* getDisplacementInput() const { return getInput(0); } 66 const SkImageFilter* getDisplacementInput() const { return getInput(0); }
67 const SkImageFilter* getColorInput() const { return getInput(1); } 67 const SkImageFilter* getColorInput() const { return getInput(1); }
68 }; 68 };
69 69
70 #endif 70 #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