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

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

Issue 1855733002: change flattenable factory to return sk_sp (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 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 | « src/effects/SkDiscretePathEffect.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 "SkDevice.h" 9 #include "SkDevice.h"
10 #include "SkReadBuffer.h" 10 #include "SkReadBuffer.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 : INHERITED(2, inputs, cropRect) 188 : INHERITED(2, inputs, cropRect)
189 , fXChannelSelector(xChannelSelector) 189 , fXChannelSelector(xChannelSelector)
190 , fYChannelSelector(yChannelSelector) 190 , fYChannelSelector(yChannelSelector)
191 , fScale(scale) 191 , fScale(scale)
192 { 192 {
193 } 193 }
194 194
195 SkDisplacementMapEffect::~SkDisplacementMapEffect() { 195 SkDisplacementMapEffect::~SkDisplacementMapEffect() {
196 } 196 }
197 197
198 SkFlattenable* SkDisplacementMapEffect::CreateProc(SkReadBuffer& buffer) { 198 sk_sp<SkFlattenable> SkDisplacementMapEffect::CreateProc(SkReadBuffer& buffer) {
199 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2); 199 SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 2);
200 ChannelSelectorType xsel = (ChannelSelectorType)buffer.readInt(); 200 ChannelSelectorType xsel = (ChannelSelectorType)buffer.readInt();
201 ChannelSelectorType ysel = (ChannelSelectorType)buffer.readInt(); 201 ChannelSelectorType ysel = (ChannelSelectorType)buffer.readInt();
202 SkScalar scale = buffer.readScalar(); 202 SkScalar scale = buffer.readScalar();
203 return Create(xsel, ysel, scale, 203 return sk_sp<SkFlattenable>(Create(xsel, ysel, scale, common.getInput(0).get (),
204 common.getInput(0).get(), common.getInput(1).get(), &common.cr opRect()); 204 common.getInput(1).get(), &common.cropRec t()));
205 } 205 }
206 206
207 void SkDisplacementMapEffect::flatten(SkWriteBuffer& buffer) const { 207 void SkDisplacementMapEffect::flatten(SkWriteBuffer& buffer) const {
208 this->INHERITED::flatten(buffer); 208 this->INHERITED::flatten(buffer);
209 buffer.writeInt((int) fXChannelSelector); 209 buffer.writeInt((int) fXChannelSelector);
210 buffer.writeInt((int) fYChannelSelector); 210 buffer.writeInt((int) fYChannelSelector);
211 buffer.writeScalar(fScale); 211 buffer.writeScalar(fScale);
212 } 212 }
213 213
214 bool SkDisplacementMapEffect::onFilterImageDeprecated(Proxy* proxy, 214 bool SkDisplacementMapEffect::onFilterImageDeprecated(Proxy* proxy,
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 void GrGLDisplacementMapEffect::GenKey(const GrProcessor& proc, 625 void GrGLDisplacementMapEffect::GenKey(const GrProcessor& proc,
626 const GrGLSLCaps&, GrProcessorKeyBuilder* b) { 626 const GrGLSLCaps&, GrProcessorKeyBuilder* b) {
627 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>(); 627 const GrDisplacementMapEffect& displacementMap = proc.cast<GrDisplacementMap Effect>();
628 628
629 uint32_t xKey = displacementMap.xChannelSelector(); 629 uint32_t xKey = displacementMap.xChannelSelector();
630 uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBit s; 630 uint32_t yKey = displacementMap.yChannelSelector() << kChannelSelectorKeyBit s;
631 631
632 b->add32(xKey | yKey); 632 b->add32(xKey | yKey);
633 } 633 }
634 #endif 634 #endif
OLDNEW
« no previous file with comments | « src/effects/SkDiscretePathEffect.cpp ('k') | src/effects/SkDropShadowImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698