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

Side by Side Diff: include/core/SkPathEffect.h

Issue 282203004: Remove SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS flag. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove default parameters in constructors. Created 6 years, 7 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 | « no previous file | include/core/SkXfermode.h » ('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 #ifndef SkPathEffect_DEFINED 10 #ifndef SkPathEffect_DEFINED
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 static SkComposePathEffect* Create(SkPathEffect* outer, SkPathEffect* inner) { 182 static SkComposePathEffect* Create(SkPathEffect* outer, SkPathEffect* inner) {
183 return SkNEW_ARGS(SkComposePathEffect, (outer, inner)); 183 return SkNEW_ARGS(SkComposePathEffect, (outer, inner));
184 } 184 }
185 185
186 virtual bool filterPath(SkPath* dst, const SkPath& src, 186 virtual bool filterPath(SkPath* dst, const SkPath& src,
187 SkStrokeRec*, const SkRect*) const SK_OVERRIDE; 187 SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
188 188
189 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposePathEffect) 189 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposePathEffect)
190 190
191 protected: 191 protected:
192 SkComposePathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {}
193
194 #ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS
195 public:
196 #endif
197 SkComposePathEffect(SkPathEffect* outer, SkPathEffect* inner) 192 SkComposePathEffect(SkPathEffect* outer, SkPathEffect* inner)
198 : INHERITED(outer, inner) {} 193 : INHERITED(outer, inner) {}
194 explicit SkComposePathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {}
199 195
200 private: 196 private:
201 // illegal 197 // illegal
202 SkComposePathEffect(const SkComposePathEffect&); 198 SkComposePathEffect(const SkComposePathEffect&);
203 SkComposePathEffect& operator=(const SkComposePathEffect&); 199 SkComposePathEffect& operator=(const SkComposePathEffect&);
204 200
205 typedef SkPairPathEffect INHERITED; 201 typedef SkPairPathEffect INHERITED;
206 }; 202 };
207 203
208 /** \class SkSumPathEffect 204 /** \class SkSumPathEffect
(...skipping 11 matching lines...) Expand all
220 static SkSumPathEffect* Create(SkPathEffect* first, SkPathEffect* second) { 216 static SkSumPathEffect* Create(SkPathEffect* first, SkPathEffect* second) {
221 return SkNEW_ARGS(SkSumPathEffect, (first, second)); 217 return SkNEW_ARGS(SkSumPathEffect, (first, second));
222 } 218 }
223 219
224 virtual bool filterPath(SkPath* dst, const SkPath& src, 220 virtual bool filterPath(SkPath* dst, const SkPath& src,
225 SkStrokeRec*, const SkRect*) const SK_OVERRIDE; 221 SkStrokeRec*, const SkRect*) const SK_OVERRIDE;
226 222
227 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSumPathEffect) 223 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkSumPathEffect)
228 224
229 protected: 225 protected:
230 SkSumPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {}
231
232 #ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS
233 public:
234 #endif
235 SkSumPathEffect(SkPathEffect* first, SkPathEffect* second) 226 SkSumPathEffect(SkPathEffect* first, SkPathEffect* second)
236 : INHERITED(first, second) {} 227 : INHERITED(first, second) {}
228 explicit SkSumPathEffect(SkReadBuffer& buffer) : INHERITED(buffer) {}
237 229
238 private: 230 private:
239 // illegal 231 // illegal
240 SkSumPathEffect(const SkSumPathEffect&); 232 SkSumPathEffect(const SkSumPathEffect&);
241 SkSumPathEffect& operator=(const SkSumPathEffect&); 233 SkSumPathEffect& operator=(const SkSumPathEffect&);
242 234
243 typedef SkPairPathEffect INHERITED; 235 typedef SkPairPathEffect INHERITED;
244 }; 236 };
245 237
246 #endif 238 #endif
OLDNEW
« no previous file with comments | « no previous file | include/core/SkXfermode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698