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

Side by Side Diff: include/effects/SkColorMatrixFilter.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 | « include/effects/SkBlurImageFilter.h ('k') | include/effects/SkComposeImageFilter.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 * Copyright 2007 The Android Open Source Project 2 * Copyright 2007 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 #ifndef SkColorMatrixFilter_DEFINED 8 #ifndef SkColorMatrixFilter_DEFINED
9 #define SkColorMatrixFilter_DEFINED 9 #define SkColorMatrixFilter_DEFINED
10 10
(...skipping 21 matching lines...) Expand all
32 struct State { 32 struct State {
33 int32_t fArray[20]; 33 int32_t fArray[20];
34 int fShift; 34 int fShift;
35 }; 35 };
36 36
37 SK_TO_STRING_OVERRIDE() 37 SK_TO_STRING_OVERRIDE()
38 38
39 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorMatrixFilter) 39 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorMatrixFilter)
40 40
41 protected: 41 protected:
42 SkColorMatrixFilter(SkReadBuffer& buffer); 42 explicit SkColorMatrixFilter(const SkColorMatrix&);
43 explicit SkColorMatrixFilter(const SkScalar array[20]);
44 explicit SkColorMatrixFilter(SkReadBuffer& buffer);
43 virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE; 45 virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
44 46
45 #ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS
46 public:
47 #endif
48 explicit SkColorMatrixFilter(const SkColorMatrix&);
49 SkColorMatrixFilter(const SkScalar array[20]);
50
51 private: 47 private:
52 SkColorMatrix fMatrix; 48 SkColorMatrix fMatrix;
53 49
54 typedef void (*Proc)(const State&, unsigned r, unsigned g, unsigned b, 50 typedef void (*Proc)(const State&, unsigned r, unsigned g, unsigned b,
55 unsigned a, int32_t result[4]); 51 unsigned a, int32_t result[4]);
56 52
57 Proc fProc; 53 Proc fProc;
58 State fState; 54 State fState;
59 uint32_t fFlags; 55 uint32_t fFlags;
60 56
61 void initState(const SkScalar array[20]); 57 void initState(const SkScalar array[20]);
62 58
63 typedef SkColorFilter INHERITED; 59 typedef SkColorFilter INHERITED;
64 }; 60 };
65 61
66 #endif 62 #endif
OLDNEW
« no previous file with comments | « include/effects/SkBlurImageFilter.h ('k') | include/effects/SkComposeImageFilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698