OLD | NEW |
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 Loading... |
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 |
OLD | NEW |