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

Side by Side Diff: include/effects/SkComposeImageFilter.h

Issue 1823573003: Change signatures of filter bounds methods to return a rect. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Hide legacy API behind #ifdef; switch callers to new API Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright 2013 Google Inc. 2 * Copyright 2013 Google Inc.
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 SkComposeImageFilter_DEFINED 8 #ifndef SkComposeImageFilter_DEFINED
9 #define SkComposeImageFilter_DEFINED 9 #define SkComposeImageFilter_DEFINED
10 10
11 #include "SkImageFilter.h" 11 #include "SkImageFilter.h"
12 12
13 class SK_API SkComposeImageFilter : public SkImageFilter { 13 class SK_API SkComposeImageFilter : public SkImageFilter {
14 public: 14 public:
15 static SkImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) { 15 static SkImageFilter* Create(SkImageFilter* outer, SkImageFilter* inner) {
16 if (!outer) { 16 if (!outer) {
17 return SkSafeRef(inner); 17 return SkSafeRef(inner);
18 } 18 }
19 if (!inner) { 19 if (!inner) {
20 return SkRef(outer); 20 return SkRef(outer);
21 } 21 }
22 SkImageFilter* inputs[2] = { outer, inner }; 22 SkImageFilter* inputs[2] = { outer, inner };
23 return new SkComposeImageFilter(inputs); 23 return new SkComposeImageFilter(inputs);
24 } 24 }
25 void computeFastBounds(const SkRect& src, SkRect* dst) const override; 25 SkRect computeFastBounds(const SkRect& src) const override;
26 26
27 SK_TO_STRING_OVERRIDE() 27 SK_TO_STRING_OVERRIDE()
28 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) 28 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter)
29 29
30 protected: 30 protected:
31 explicit SkComposeImageFilter(SkImageFilter* inputs[2]) : INHERITED(2, input s) { 31 explicit SkComposeImageFilter(SkImageFilter* inputs[2]) : INHERITED(2, input s) {
32 SkASSERT(inputs[0]); 32 SkASSERT(inputs[0]);
33 SkASSERT(inputs[1]); 33 SkASSERT(inputs[1]);
34 } 34 }
35 SkSpecialImage* onFilterImage(SkSpecialImage* source, const Context&, 35 SkSpecialImage* onFilterImage(SkSpecialImage* source, const Context&,
36 SkIPoint* offset) const override; 36 SkIPoint* offset) const override;
37 bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*, MapDirection) const override; 37 SkIRect onFilterBounds(const SkIRect&, const SkMatrix&, MapDirection) const override;
38 38
39 private: 39 private:
40 typedef SkImageFilter INHERITED; 40 typedef SkImageFilter INHERITED;
41 }; 41 };
42 42
43 #endif 43 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698