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

Side by Side Diff: src/animator/SkDisplayMath.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 3 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/animator/SkDisplayList.cpp ('k') | src/animator/SkDisplayMovie.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 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "SkDisplayMath.h" 10 #include "SkDisplayMath.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 SK_MEMBER_FUNCTION(tan, Float) 124 SK_MEMBER_FUNCTION(tan, Float)
125 }; 125 };
126 126
127 #endif 127 #endif
128 128
129 DEFINE_GET_MEMBER(SkDisplayMath); 129 DEFINE_GET_MEMBER(SkDisplayMath);
130 130
131 void SkDisplayMath::executeFunction(SkDisplayable* target, int index, 131 void SkDisplayMath::executeFunction(SkDisplayable* target, int index,
132 SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type, 132 SkTDArray<SkScriptValue>& parameters, SkDisplayTypes type,
133 SkScriptValue* scriptValue) { 133 SkScriptValue* scriptValue) {
134 if (scriptValue == NULL) 134 if (scriptValue == nullptr)
135 return; 135 return;
136 SkASSERT(target == this); 136 SkASSERT(target == this);
137 SkScriptValue* array = parameters.begin(); 137 SkScriptValue* array = parameters.begin();
138 SkScriptValue* end = parameters.end(); 138 SkScriptValue* end = parameters.end();
139 SkScalar input = parameters[0].fOperand.fScalar; 139 SkScalar input = parameters[0].fOperand.fScalar;
140 SkScalar scalarResult; 140 SkScalar scalarResult;
141 switch (index) { 141 switch (index) {
142 case SK_FUNCTION(abs): 142 case SK_FUNCTION(abs):
143 scalarResult = SkScalarAbs(input); 143 scalarResult = SkScalarAbs(input);
144 break; 144 break;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 220
221 bool SkDisplayMath::getProperty(int index, SkScriptValue* value) const { 221 bool SkDisplayMath::getProperty(int index, SkScriptValue* value) const {
222 if ((unsigned)index < SK_ARRAY_COUNT(gConstants)) { 222 if ((unsigned)index < SK_ARRAY_COUNT(gConstants)) {
223 value->fOperand.fScalar = gConstants[index]; 223 value->fOperand.fScalar = gConstants[index];
224 value->fType = SkType_Float; 224 value->fType = SkType_Float;
225 return true; 225 return true;
226 } 226 }
227 SkASSERT(0); 227 SkASSERT(0);
228 return false; 228 return false;
229 } 229 }
OLDNEW
« no previous file with comments | « src/animator/SkDisplayList.cpp ('k') | src/animator/SkDisplayMovie.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698