aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-23 16:27:48 +0000
committerGravatar senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-23 16:27:48 +0000
commite52f209aec1e8b36f5dd94ffb871712e69fa90a6 (patch)
tree7563105ec3907c0ee497d04c1621a3db4764dba3 /src
parentc899ad9c7fa28234d99479ab09afb6866bbd8dc3 (diff)
Speculative Android GM blend fix (unreviewed).
git-svn-id: http://skia.googlecode.com/svn/trunk@5257 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r--src/effects/SkBlendImageFilter.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp
index 0455eee6d5..f4ef9def7f 100644
--- a/src/effects/SkBlendImageFilter.cpp
+++ b/src/effects/SkBlendImageFilter.cpp
@@ -52,12 +52,10 @@ SkPMColor multiply_proc(SkPMColor src, SkPMColor dst) {
///////////////////////////////////////////////////////////////////////////////
SkBlendImageFilter::SkBlendImageFilter(SkBlendImageFilter::Mode mode, SkImageFilter* background, SkImageFilter* foreground)
- : fMode(mode)
+ : fMode(mode), fBackground(background), fForeground(foreground)
{
- fBackground = background;
- SkASSERT(background != NULL);
+ SkASSERT(NULL != background);
SkSafeRef(fBackground);
- fForeground = foreground;
SkSafeRef(fForeground);
}
@@ -94,7 +92,7 @@ bool SkBlendImageFilter::onFilterImage(Proxy* proxy,
SkBitmap* dst,
SkIPoint* offset) {
SkBitmap background, foreground = src;
- SkASSERT(fBackground);
+ SkASSERT(NULL != fBackground);
if (!fBackground->filterImage(proxy, src, ctm, &background, offset)) {
return false;
}