diff options
| author |  Mike Reed <reed@google.com> | 2017-07-13 17:16:34 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-13 17:16:43 +0000 |
| commit | 771ae9682f25ea23de32f85be0d3239ad5acec30 (patch) | |
| tree | 164473ef2e010ff285eab04027b9739e6da5adc8 /gn/core.gni | |
| parent | b4d6106345358df0e95845d7ac27e773e793057d (diff) | |
Revert "Revert "Experimental blur code with 32 bit fix.""
This reverts commit 27b3d272a8fcce24813212f5816b177090111ec6.
Reason for revert: guard has landed in android
Original change's description:
> Revert "Experimental blur code with 32 bit fix."
>
> This reverts commit d4b2c537d058ad4cb890ba116d00aa86c3416c08.
>
> Reason for revert: speculative fix for android-roll
>
> java.lang.AssertionError: expected:<0> but was:<255>
> at org.junit.Assert.fail(Assert.java:88)
> at org.junit.Assert.failNotEquals(Assert.java:834)
> at org.junit.Assert.assertEquals(Assert.java:645)
> at org.junit.Assert.assertEquals(Assert.java:631)
> at android.graphics.cts.BlurMaskFilterTest.verifyColor(BlurMaskFilterTest.java:79)
> at android.graphics.cts.BlurMaskFilterTest.verifyQuadrants(BlurMaskFilterTest.java:72)
> at android.graphics.cts.BlurMaskFilterTest.testBlurMaskFilter(BlurMaskFilterTest.java:56)
>
> Original change's description:
> > Experimental blur code with 32 bit fix.
> >
> > This uses a new method of blurring that runs the three
> > passes of the box filter in a single pass. This implementation
> > currently only does 1x1 pixel at a time, but it should be simple
> > to expand to 4x4 pixels at a time.
> >
> > On the blur_10_normal_high_quality benchmark, the new is 7% faster
> > than the old code. For the blur_100.50_normal_high_quality
> > benchmark, the new code is 11% slower.
> >
> > Bug: skia:
> > Change-Id: I847270906b0ceac1dfbf43ab5446756689ef660f
> > Reviewed-on: https://skia-review.googlesource.com/22700
> > Reviewed-by: Mike Reed <reed@google.com>
> > Commit-Queue: Herb Derby <herb@google.com>
>
> TBR=herb@google.com,reed@google.com
>
> Change-Id: Ie84f6bf8872cae08c06d679f0c2f2e6c3d8a02a2
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/22880
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Mike Reed <reed@google.com>
TBR=herb@google.com,reed@google.com
Change-Id: I393d1c05f83ccf98137201bc7b4e7d8e8b0e8742
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/23121
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'gn/core.gni')
| -rw-r--r-- | gn/core.gni | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gn/core.gni b/gn/core.gni index 187a6de902..39a80fef85 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -178,6 +178,8 @@ skia_core_sources = [ "$_src/core/SkMD5.h", "$_src/core/SkMallocPixelRef.cpp", "$_src/core/SkMask.cpp", + "$_src/core/SkMaskBlurFilter.h", + "$_src/core/SkMaskBlurFilter.cpp", "$_src/core/SkMaskCache.cpp", "$_src/core/SkMaskFilter.cpp", "$_src/core/SkMaskGamma.cpp", |