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

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

Issue 968993004: add virtuals to optimize composing colorfilters (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: fix param warning Created 5 years, 9 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 | « include/effects/SkColorMatrixFilter.h ('k') | src/effects/SkColorFilterImageFilter.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 "SkString.h" 10 #include "SkString.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 97
98 typedef SkColorFilter INHERITED; 98 typedef SkColorFilter INHERITED;
99 }; 99 };
100 100
101 SkFlattenable* SkComposeColorFilter::CreateProc(SkReadBuffer& buffer) { 101 SkFlattenable* SkComposeColorFilter::CreateProc(SkReadBuffer& buffer) {
102 SkAutoTUnref<SkColorFilter> outer(buffer.readColorFilter()); 102 SkAutoTUnref<SkColorFilter> outer(buffer.readColorFilter());
103 SkAutoTUnref<SkColorFilter> inner(buffer.readColorFilter()); 103 SkAutoTUnref<SkColorFilter> inner(buffer.readColorFilter());
104 return CreateComposeFilter(outer, inner); 104 return CreateComposeFilter(outer, inner);
105 } 105 }
106 106
107 //////////////////////////////////////////////////////////////////////////////// ///////////////////
108
107 SkColorFilter* SkColorFilter::CreateComposeFilter(SkColorFilter* outer, SkColorF ilter* inner) { 109 SkColorFilter* SkColorFilter::CreateComposeFilter(SkColorFilter* outer, SkColorF ilter* inner) {
108 if (!outer) { 110 if (!outer) {
109 return SkSafeRef(inner); 111 return SkSafeRef(inner);
110 } 112 }
111 if (!inner) { 113 if (!inner) {
112 return SkSafeRef(outer); 114 return SkSafeRef(outer);
113 } 115 }
114 return SkNEW_ARGS(SkComposeColorFilter, (outer, inner)); 116
117 // Give the subclass a shot at a more optimal composition...
118 SkColorFilter* composition = outer->newComposed(inner);
119 if (NULL == composition) {
120 composition = SkNEW_ARGS(SkComposeColorFilter, (outer, inner));
121 }
122 return composition;
115 } 123 }
116 124
117 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter) 125 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkColorFilter)
118 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeColorFilter) 126 SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkComposeColorFilter)
119 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END 127 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END
120 128
OLDNEW
« no previous file with comments | « include/effects/SkColorMatrixFilter.h ('k') | src/effects/SkColorFilterImageFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698