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

Side by Side Diff: src/core/SkColorFilter.cpp

Issue 1316123003: Style Change: SkNEW->new; SkDELETE->delete (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-26 (Wednesday) 15:59:00 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/core/SkClipStack.cpp ('k') | src/core/SkComposeShader.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 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 "SkColorFilter.h" 8 #include "SkColorFilter.h"
9 #include "SkReadBuffer.h" 9 #include "SkReadBuffer.h"
10 #include "SkRefCnt.h" 10 #include "SkRefCnt.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 // Give the subclass a shot at a more optimal composition... 125 // Give the subclass a shot at a more optimal composition...
126 SkColorFilter* composition = outer->newComposed(inner); 126 SkColorFilter* composition = outer->newComposed(inner);
127 if (composition) { 127 if (composition) {
128 return composition; 128 return composition;
129 } 129 }
130 130
131 int count = inner->privateComposedFilterCount() + outer->privateComposedFilt erCount(); 131 int count = inner->privateComposedFilterCount() + outer->privateComposedFilt erCount();
132 if (count > SK_MAX_COMPOSE_COLORFILTER_COUNT) { 132 if (count > SK_MAX_COMPOSE_COLORFILTER_COUNT) {
133 return NULL; 133 return NULL;
134 } 134 }
135 return SkNEW_ARGS(SkComposeColorFilter, (outer, inner, count)); 135 return new SkComposeColorFilter(outer, inner, count);
136 } 136 }
137 137
138 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter) 138 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter)
139 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeColorFilter) 139 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeColorFilter)
140 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END 140 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
141 141
OLDNEW
« no previous file with comments | « src/core/SkClipStack.cpp ('k') | src/core/SkComposeShader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698