AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Proper Android fix, and revert of workaround in r5267. Unreviewed.

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@5269 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
senorblanco@chromium.org 2012-08-23 19:10:04 +00:00
parent 42e1f0f573
commit d912ca4199
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/effects/SkBlendImageFilter.cpp
View File

@ -92,10 +92,6 @@ bool SkBlendImageFilter::onFilterImage(Proxy* proxy,
SkBitmap* dst, SkBitmap* dst,
SkIPoint* offset) { SkIPoint* offset) {
SkBitmap background, foreground = src; SkBitmap background, foreground = src;
// FIXME: This shouldn't happen, but some reason it does on Android.
// (bad serialization?)
if (NULL == fBackground)
return false;
SkASSERT(NULL != fBackground); SkASSERT(NULL != fBackground);
if (!fBackground->filterImage(proxy, src, ctm, &background, offset)) { if (!fBackground->filterImage(proxy, src, ctm, &background, offset)) {
return false; return false;

2
src/ports/SkGlobalInitialization_default.cpp
View File

@ -21,6 +21,7 @@
#include "Sk1DPathEffect.h" #include "Sk1DPathEffect.h"
#include "Sk2DPathEffect.h" #include "Sk2DPathEffect.h"
#include "SkAvoidXfermode.h" #include "SkAvoidXfermode.h"
#include "SkBitmapSource.h"
#include "SkBlendImageFilter.h" #include "SkBlendImageFilter.h"
#include "SkBlurDrawLooper.h" #include "SkBlurDrawLooper.h"
#include "SkBlurImageFilter.h" #include "SkBlurImageFilter.h"
@ -53,6 +54,7 @@ void SkFlattenable::InitializeFlattenables() {
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkAvoidXfermode) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkAvoidXfermode)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapProcShader)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBitmapSource)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlendImageFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlendImageFilter)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurDrawLooper) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurDrawLooper)
SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter) SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkBlurImageFilter)