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

Side by Side Diff: src/effects/SkDisplacementMapEffect.cpp

Issue 376953003: Clean up SkImageFilter constructors. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fixed 100-col issues Created 6 years, 5 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 | « src/effects/SkColorFilterImageFilter.cpp ('k') | src/effects/SkDropShadowImageFilter.cpp » ('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 #include "SkDisplacementMapEffect.h" 8 #include "SkDisplacementMapEffect.h"
9 #include "SkReadBuffer.h" 9 #include "SkReadBuffer.h"
10 #include "SkWriteBuffer.h" 10 #include "SkWriteBuffer.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 return false; 154 return false;
155 } 155 }
156 156
157 } // end namespace 157 } // end namespace
158 158
159 /////////////////////////////////////////////////////////////////////////////// 159 ///////////////////////////////////////////////////////////////////////////////
160 160
161 SkDisplacementMapEffect::SkDisplacementMapEffect(ChannelSelectorType xChannelSel ector, 161 SkDisplacementMapEffect::SkDisplacementMapEffect(ChannelSelectorType xChannelSel ector,
162 ChannelSelectorType yChannelSel ector, 162 ChannelSelectorType yChannelSel ector,
163 SkScalar scale, 163 SkScalar scale,
164 SkImageFilter* displacement, 164 SkImageFilter* inputs[2],
165 SkImageFilter* color,
166 const CropRect* cropRect) 165 const CropRect* cropRect)
167 : INHERITED(displacement, color, cropRect) 166 : INHERITED(2, inputs, cropRect)
168 , fXChannelSelector(xChannelSelector) 167 , fXChannelSelector(xChannelSelector)
169 , fYChannelSelector(yChannelSelector) 168 , fYChannelSelector(yChannelSelector)
170 , fScale(scale) 169 , fScale(scale)
171 { 170 {
172 } 171 }
173 172
174 SkDisplacementMapEffect::~SkDisplacementMapEffect() { 173 SkDisplacementMapEffect::~SkDisplacementMapEffect() {
175 } 174 }
176 175
177 SkDisplacementMapEffect::SkDisplacementMapEffect(SkReadBuffer& buffer) 176 SkDisplacementMapEffect::SkDisplacementMapEffect(SkReadBuffer& buffer)
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 const GrGLCaps&) { 604 const GrGLCaps&) {
606 const GrDisplacementMapEffect& displacementMap = 605 const GrDisplacementMapEffect& displacementMap =
607 drawEffect.castEffect<GrDisplacementMapEffect>(); 606 drawEffect.castEffect<GrDisplacementMapEffect>();
608 607
609 EffectKey xKey = displacementMap.xChannelSelector(); 608 EffectKey xKey = displacementMap.xChannelSelector();
610 EffectKey yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBi ts; 609 EffectKey yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBi ts;
611 610
612 return xKey | yKey; 611 return xKey | yKey;
613 } 612 }
614 #endif 613 #endif
OLDNEW
« no previous file with comments | « src/effects/SkColorFilterImageFilter.cpp ('k') | src/effects/SkDropShadowImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698