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

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

Issue 83343003: Adding more validation (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Fixed comments Created 7 years 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 | Annotate | Revision Log
« no previous file with comments | « src/effects/SkComposeImageFilter.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 "SkFlattenableBuffers.h" 9 #include "SkFlattenableBuffers.h"
10 #include "SkUnPreMultiply.h" 10 #include "SkUnPreMultiply.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 , fXChannelSelector(xChannelSelector) 154 , fXChannelSelector(xChannelSelector)
155 , fYChannelSelector(yChannelSelector) 155 , fYChannelSelector(yChannelSelector)
156 , fScale(scale) 156 , fScale(scale)
157 { 157 {
158 } 158 }
159 159
160 SkDisplacementMapEffect::~SkDisplacementMapEffect() { 160 SkDisplacementMapEffect::~SkDisplacementMapEffect() {
161 } 161 }
162 162
163 SkDisplacementMapEffect::SkDisplacementMapEffect(SkFlattenableReadBuffer& buffer ) 163 SkDisplacementMapEffect::SkDisplacementMapEffect(SkFlattenableReadBuffer& buffer )
164 : INHERITED(buffer) 164 : INHERITED(2, buffer)
165 { 165 {
166 fXChannelSelector = (SkDisplacementMapEffect::ChannelSelectorType) buffer.re adInt(); 166 fXChannelSelector = (SkDisplacementMapEffect::ChannelSelectorType) buffer.re adInt();
167 fYChannelSelector = (SkDisplacementMapEffect::ChannelSelectorType) buffer.re adInt(); 167 fYChannelSelector = (SkDisplacementMapEffect::ChannelSelectorType) buffer.re adInt();
168 fScale = buffer.readScalar(); 168 fScale = buffer.readScalar();
169 buffer.validate(channel_selector_type_is_valid(fXChannelSelector) && 169 buffer.validate(channel_selector_type_is_valid(fXChannelSelector) &&
170 channel_selector_type_is_valid(fYChannelSelector) && 170 channel_selector_type_is_valid(fYChannelSelector) &&
171 SkScalarIsFinite(fScale)); 171 SkScalarIsFinite(fScale));
172 } 172 }
173 173
174 void SkDisplacementMapEffect::flatten(SkFlattenableWriteBuffer& buffer) const { 174 void SkDisplacementMapEffect::flatten(SkFlattenableWriteBuffer& buffer) const {
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 const GrGLCaps&) { 524 const GrGLCaps&) {
525 const GrDisplacementMapEffect& displacementMap = 525 const GrDisplacementMapEffect& displacementMap =
526 drawEffect.castEffect<GrDisplacementMapEffect>(); 526 drawEffect.castEffect<GrDisplacementMapEffect>();
527 527
528 EffectKey xKey = displacementMap.xChannelSelector(); 528 EffectKey xKey = displacementMap.xChannelSelector();
529 EffectKey yKey = displacementMap.yChannelSelector() << SkDisplacementMapEffe ct::kKeyBits; 529 EffectKey yKey = displacementMap.yChannelSelector() << SkDisplacementMapEffe ct::kKeyBits;
530 530
531 return xKey | yKey; 531 return xKey | yKey;
532 } 532 }
533 #endif 533 #endif
OLDNEW
« no previous file with comments | « src/effects/SkComposeImageFilter.cpp ('k') | src/effects/SkDropShadowImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698