| 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 return composition; | 133 return composition; |
| 134 } | 134 } |
| 135 | 135 |
| 136 int count = inner->privateComposedFilterCount() + outer->privateComposedFilt
erCount(); | 136 int count = inner->privateComposedFilterCount() + outer->privateComposedFilt
erCount(); |
| 137 if (count > SK_MAX_COMPOSE_COLORFILTER_COUNT) { | 137 if (count > SK_MAX_COMPOSE_COLORFILTER_COUNT) { |
| 138 return nullptr; | 138 return nullptr; |
| 139 } | 139 } |
| 140 return new SkComposeColorFilter(outer, inner, count); | 140 return new SkComposeColorFilter(outer, inner, count); |
| 141 } | 141 } |
| 142 | 142 |
| 143 #include "SkModeColorFilter.h" |
| 144 |
| 143 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter) | 145 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter) |
| 144 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeColorFilter) | 146 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeColorFilter) |
| 147 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkModeColorFilter) |
| 145 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END | 148 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END |
| 146 | 149 |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1577073002:
remove external header for SkModeColorFilter (Closed)
Base URL: https://skia.googlesource.com/skia.git@master