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

Side by Side Diff: src/effects/gradients/SkGradientShader.cpp

Issue 37803002: Adding size parameter to read array functions (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Fixed comments Created 7 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
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 "SkGradientShaderPriv.h" 8 #include "SkGradientShaderPriv.h"
9 #include "SkLinearGradient.h" 9 #include "SkLinearGradient.h"
10 #include "SkRadialGradient.h" 10 #include "SkRadialGradient.h"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 fCache32 = NULL; 152 fCache32 = NULL;
153 fCache32PixelRef = NULL; 153 fCache32PixelRef = NULL;
154 154
155 int colorCount = fColorCount = buffer.getArrayCount(); 155 int colorCount = fColorCount = buffer.getArrayCount();
156 if (colorCount > kColorStorageCount) { 156 if (colorCount > kColorStorageCount) {
157 size_t size = sizeof(SkColor) + sizeof(SkPMColor) + sizeof(Rec); 157 size_t size = sizeof(SkColor) + sizeof(SkPMColor) + sizeof(Rec);
158 fOrigColors = (SkColor*)sk_malloc_throw(size * colorCount); 158 fOrigColors = (SkColor*)sk_malloc_throw(size * colorCount);
159 } else { 159 } else {
160 fOrigColors = fStorage; 160 fOrigColors = fStorage;
161 } 161 }
162 buffer.readColorArray(fOrigColors); 162 buffer.readColorArray(fOrigColors, colorCount);
163 163
164 { 164 {
165 uint32_t packed = buffer.readUInt(); 165 uint32_t packed = buffer.readUInt();
166 fGradFlags = SkToU8(unpack_flags(packed)); 166 fGradFlags = SkToU8(unpack_flags(packed));
167 fTileMode = unpack_mode(packed); 167 fTileMode = unpack_mode(packed);
168 } 168 }
169 fTileProc = gTileProcs[fTileMode]; 169 fTileProc = gTileProcs[fTileMode];
170 fRecs = (Rec*)(fOrigColors + colorCount); 170 fRecs = (Rec*)(fOrigColors + colorCount);
171 if (colorCount > 2) { 171 if (colorCount > 2) {
172 Rec* recs = fRecs; 172 Rec* recs = fRecs;
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after
1133 (*stops)[i] = stop; 1133 (*stops)[i] = stop;
1134 stop = i < outColors - 1 ? stop + random->nextUScalar1() * (1.f - st op) : 1.f; 1134 stop = i < outColors - 1 ? stop + random->nextUScalar1() * (1.f - st op) : 1.f;
1135 } 1135 }
1136 } 1136 }
1137 *tm = static_cast<SkShader::TileMode>(random->nextULessThan(SkShader::kTileM odeCount)); 1137 *tm = static_cast<SkShader::TileMode>(random->nextULessThan(SkShader::kTileM odeCount));
1138 1138
1139 return outColors; 1139 return outColors;
1140 } 1140 }
1141 1141
1142 #endif 1142 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698