| OLD | NEW |
| 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 typedef SkImageFilter INHERITED; |
| 15 |
| 14 public: | 16 public: |
| 15 SkComposeImageFilter(SkImageFilter* outer, SkImageFilter* inner) : INHERITED
(outer, inner) {} | 17 SkComposeImageFilter(SkImageFilter* outer, SkImageFilter* inner) : INHERITED
(outer, inner) {} |
| 16 virtual ~SkComposeImageFilter(); | 18 virtual ~SkComposeImageFilter(); |
| 17 | 19 |
| 18 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) | 20 SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkComposeImageFilter) |
| 19 | 21 |
| 20 protected: | 22 protected: |
| 21 explicit SkComposeImageFilter(SkFlattenableReadBuffer& buffer); | 23 explicit SkComposeImageFilter(SkFlattenableReadBuffer& buffer); |
| 22 | 24 |
| 23 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, | 25 virtual bool onFilterImage(Proxy*, const SkBitmap& src, const SkMatrix&, |
| 24 SkBitmap* result, SkIPoint* loc) SK_OVERRIDE; | 26 SkBitmap* result, SkIPoint* loc) SK_OVERRIDE; |
| 25 virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) SK_OV
ERRIDE; | 27 virtual bool onFilterBounds(const SkIRect&, const SkMatrix&, SkIRect*) SK_OV
ERRIDE; |
| 26 | |
| 27 private: | |
| 28 typedef SkImageFilter INHERITED; | |
| 29 }; | 28 }; |
| 30 | 29 |
| 31 #endif | 30 #endif |
| OLD | NEW |