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

Side by Side Diff: include/core/SkColor.h

Issue 1622983002: Revert[2] of expand unitests for color4f (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: call the generic destructor, so we go throught the virtual chain Created 4 years, 11 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 | « no previous file | include/core/SkColorFilter.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 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 #ifndef SkColor_DEFINED 8 #ifndef SkColor_DEFINED
9 #define SkColor_DEFINED 9 #define SkColor_DEFINED
10 10
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 162
163 //////////////////////////////////////////////////////////////////////////////// /////////////////// 163 //////////////////////////////////////////////////////////////////////////////// ///////////////////
164 164
165 /* 165 /*
166 * The float values are 0...1 premultiplied 166 * The float values are 0...1 premultiplied
167 */ 167 */
168 struct SkPM4f { 168 struct SkPM4f {
169 float fVec[4]; 169 float fVec[4];
170 170
171 float a() const { return fVec[SK_A32_SHIFT/8]; } 171 float a() const { return fVec[SK_A32_SHIFT/8]; }
172
173 static SkPM4f FromPMColor(SkPMColor);
172 }; 174 };
173 175
174 /* 176 /*
175 * The float values are 0...1 unpremultiplied 177 * The float values are 0...1 unpremultiplied
176 */ 178 */
177 struct SkColor4f { 179 struct SkColor4f {
178 float fA; 180 float fA;
179 float fR; 181 float fR;
180 float fG; 182 float fG;
181 float fB; 183 float fB;
(...skipping 12 matching lines...) Expand all
194 static SkColor4f FromColor(SkColor); 196 static SkColor4f FromColor(SkColor);
195 197
196 SkColor4f pin() const { 198 SkColor4f pin() const {
197 return Pin(fA, fR, fG, fB); 199 return Pin(fA, fR, fG, fB);
198 } 200 }
199 201
200 SkPM4f premul() const; 202 SkPM4f premul() const;
201 }; 203 };
202 204
203 #endif 205 #endif
OLDNEW
« no previous file with comments | « no previous file | include/core/SkColorFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698