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

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

Issue 282203004: Remove SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS flag. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove default parameters in constructors. Created 6 years, 7 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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&, 44 virtual bool onFilterBounds(const SkIRect& src, const SkMatrix&,
45 SkIRect* dst) const SK_OVERRIDE; 45 SkIRect* dst) const SK_OVERRIDE;
46 46
47 #if SK_SUPPORT_GPU 47 #if SK_SUPPORT_GPU
48 virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; } 48 virtual bool canFilterImageGPU() const SK_OVERRIDE { return true; }
49 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context & ctx, 49 virtual bool filterImageGPU(Proxy* proxy, const SkBitmap& src, const Context & ctx,
50 SkBitmap* result, SkIPoint* offset) const SK_OVE RRIDE; 50 SkBitmap* result, SkIPoint* offset) const SK_OVE RRIDE;
51 #endif 51 #endif
52 52
53 protected: 53 protected:
54 explicit SkDisplacementMapEffect(SkReadBuffer& buffer);
55 virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
56
57 #ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS
58 public:
59 #endif
60 SkDisplacementMapEffect(ChannelSelectorType xChannelSelector, 54 SkDisplacementMapEffect(ChannelSelectorType xChannelSelector,
61 ChannelSelectorType yChannelSelector, 55 ChannelSelectorType yChannelSelector,
62 SkScalar scale, SkImageFilter* displacement, 56 SkScalar scale, SkImageFilter* displacement,
63 SkImageFilter* color = NULL, 57 SkImageFilter* color = NULL,
64 const CropRect* cropRect = NULL); 58 const CropRect* cropRect = NULL);
59 explicit SkDisplacementMapEffect(SkReadBuffer& buffer);
60 virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
65 61
66 private: 62 private:
67 ChannelSelectorType fXChannelSelector; 63 ChannelSelectorType fXChannelSelector;
68 ChannelSelectorType fYChannelSelector; 64 ChannelSelectorType fYChannelSelector;
69 SkScalar fScale; 65 SkScalar fScale;
70 typedef SkImageFilter INHERITED; 66 typedef SkImageFilter INHERITED;
71 const SkImageFilter* getDisplacementInput() const { return getInput(0); } 67 const SkImageFilter* getDisplacementInput() const { return getInput(0); }
72 const SkImageFilter* getColorInput() const { return getInput(1); } 68 const SkImageFilter* getColorInput() const { return getInput(1); }
73 }; 69 };
74 70
75 #endif 71 #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