| 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 #include "SkBitmap.h" | 8 #include "SkBitmap.h" |
| 9 #include "SkComposeImageFilter.h" | 9 #include "SkComposeImageFilter.h" |
| 10 #include "SkReadBuffer.h" | 10 #include "SkReadBuffer.h" |
| 11 #include "SkWriteBuffer.h" | 11 #include "SkWriteBuffer.h" |
| 12 | 12 |
| 13 SkComposeImageFilter::~SkComposeImageFilter() { | 13 SkComposeImageFilter::~SkComposeImageFilter() { |
| 14 } | 14 } |
| 15 | 15 |
| 16 bool SkComposeImageFilter::onFilterImage(Proxy* proxy, | 16 bool SkComposeImageFilter::onFilterImage(Proxy* proxy, |
| 17 const SkBitmap& src, | 17 const SkBitmap& src, |
| 18 const SkMatrix& ctm, | 18 const Context& ctx, |
| 19 SkBitmap* result, | 19 SkBitmap* result, |
| 20 SkIPoint* offset) const { | 20 SkIPoint* offset) const { |
| 21 SkImageFilter* outer = getInput(0); | 21 SkImageFilter* outer = getInput(0); |
| 22 SkImageFilter* inner = getInput(1); | 22 SkImageFilter* inner = getInput(1); |
| 23 | 23 |
| 24 if (!outer && !inner) { | 24 if (!outer && !inner) { |
| 25 return false; | 25 return false; |
| 26 } | 26 } |
| 27 | 27 |
| 28 if (!outer || !inner) { | 28 if (!outer || !inner) { |
| 29 return (outer ? outer : inner)->filterImage(proxy, src, ctm, result, off
set); | 29 return (outer ? outer : inner)->filterImage(proxy, src, ctx, result, off
set); |
| 30 } | 30 } |
| 31 | 31 |
| 32 SkBitmap tmp; | 32 SkBitmap tmp; |
| 33 return inner->filterImage(proxy, src, ctm, &tmp, offset) && | 33 return inner->filterImage(proxy, src, ctx, &tmp, offset) && |
| 34 outer->filterImage(proxy, tmp, ctm, result, offset); | 34 outer->filterImage(proxy, tmp, ctx, result, offset); |
| 35 } | 35 } |
| 36 | 36 |
| 37 bool SkComposeImageFilter::onFilterBounds(const SkIRect& src, | 37 bool SkComposeImageFilter::onFilterBounds(const SkIRect& src, |
| 38 const SkMatrix& ctm, | 38 const SkMatrix& ctm, |
| 39 SkIRect* dst) const { | 39 SkIRect* dst) const { |
| 40 SkImageFilter* outer = getInput(0); | 40 SkImageFilter* outer = getInput(0); |
| 41 SkImageFilter* inner = getInput(1); | 41 SkImageFilter* inner = getInput(1); |
| 42 | 42 |
| 43 if (!outer && !inner) { | 43 if (!outer && !inner) { |
| 44 return false; | 44 return false; |
| 45 } | 45 } |
| 46 | 46 |
| 47 if (!outer || !inner) { | 47 if (!outer || !inner) { |
| 48 return (outer ? outer : inner)->filterBounds(src, ctm, dst); | 48 return (outer ? outer : inner)->filterBounds(src, ctm, dst); |
| 49 } | 49 } |
| 50 | 50 |
| 51 SkIRect tmp; | 51 SkIRect tmp; |
| 52 return inner->filterBounds(src, ctm, &tmp) && | 52 return inner->filterBounds(src, ctm, &tmp) && |
| 53 outer->filterBounds(tmp, ctm, dst); | 53 outer->filterBounds(tmp, ctm, dst); |
| 54 } | 54 } |
| 55 | 55 |
| 56 SkComposeImageFilter::SkComposeImageFilter(SkReadBuffer& buffer) | 56 SkComposeImageFilter::SkComposeImageFilter(SkReadBuffer& buffer) |
| 57 : INHERITED(2, buffer) { | 57 : INHERITED(2, buffer) { |
| 58 } | 58 } |
| OLD | NEW |