aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkMaskBlurFilter.cpp
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@google.com>2017-07-21 16:06:57 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-07-21 16:07:06 +0000
commit8825a09fc88f46dcec1d547dfbe7457ea224790b (patch)
tree08d2c0468b4901a4793653a44611d73e1a033f79 /src/core/SkMaskBlurFilter.cpp
parent353196f44f8c4f5fc3dc3783241faef264b80927 (diff)
Revert "check for no blur and exit early"
This reverts commit 35a5e418b96053bbdebef2cceb33db995f960010. Reason for revert: breaks google 3 Original change's description: > check for no blur and exit early > > Bug: skia: > Change-Id: I98c07c5fd77ec67398dd4df12fb6a24aa4ca7731 > Reviewed-on: https://skia-review.googlesource.com/25567 > Commit-Queue: Mike Reed <reed@google.com> > Reviewed-by: Mike Klein <mtklein@chromium.org> > Reviewed-by: Florin Malita <fmalita@chromium.org> TBR=mtklein@chromium.org,mtklein@google.com,fmalita@chromium.org,reed@google.com Change-Id: I9c4b50bb2fda504e5c61ed03c0722abff327ca72 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/25568 Reviewed-by: Cary Clark <caryclark@google.com> Commit-Queue: Cary Clark <caryclark@google.com>
Diffstat (limited to 'src/core/SkMaskBlurFilter.cpp')
-rw-r--r--src/core/SkMaskBlurFilter.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/SkMaskBlurFilter.cpp b/src/core/SkMaskBlurFilter.cpp
index 85ed3364ee..0f0286354c 100644
--- a/src/core/SkMaskBlurFilter.cpp
+++ b/src/core/SkMaskBlurFilter.cpp
@@ -70,10 +70,6 @@ SkMaskBlurFilter::SkMaskBlurFilter(double sigmaW, double sigmaH)
, fBuffer2{skstd::make_unique_default<uint32_t[]>(bufferSize(2))} {
}
-bool SkMaskBlurFilter::hasNoBlur() const {
- return fInfoW.weight() <= 1 && fInfoH.weight() <= 1;
-}
-
SkIPoint SkMaskBlurFilter::blur(const SkMask& src, SkMask* dst) const {
uint64_t weightW = fInfoW.weight();
@@ -150,7 +146,7 @@ SkIPoint SkMaskBlurFilter::blur(const SkMask& src, SkMask* dst) const {
}
} else {
// Copy to dst. No Blur.
- SkASSERT(!"don't call me");
+
for (size_t y = 0; y < srcH; y++) {
std::memcpy(&dst->fImage[y * dst->fRowBytes], &src.fImage[y * src.fRowBytes], dstW);
}