diff options
author | 2017-07-13 01:19:16 +0000 | |
---|---|---|
committer | 2017-07-13 01:19:23 +0000 | |
commit | 27b3d272a8fcce24813212f5816b177090111ec6 (patch) | |
tree | 0406f2faa23f6652511e428ee1686fc5e922ff8f /src/core/SkMakeUnique.h | |
parent | f0366326cc565c9e1535e4ac4baf273d7ea0d816 (diff) |
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>
Diffstat (limited to 'src/core/SkMakeUnique.h')
-rw-r--r-- | src/core/SkMakeUnique.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/core/SkMakeUnique.h b/src/core/SkMakeUnique.h index 860ea2e8a7..188eb05ff4 100644 --- a/src/core/SkMakeUnique.h +++ b/src/core/SkMakeUnique.h @@ -18,11 +18,6 @@ std::unique_ptr<T> make_unique(Args&&... args) { return std::unique_ptr<T>(new T(std::forward<Args>(args)...)); } -template<typename T> -std::unique_ptr<T> make_unique_default(size_t n) { - return std::unique_ptr<T>(new typename std::remove_extent<T>::type[n]); -} - } #endif // SkMakeUnique_DEFINED |