Revert "Revert of https://codereview.chromium.org/108773003/"

src/core/SkMaskFilter.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkMaskFilter.h"
@@ skipping 331 matching lines @@
     } else {
         src.reset((GrTexture*) srcBM.getTexture());
         src.get()->ref();
     }
     GrTexture* dst;
 
     bool result = this->filterMaskGPU(src, maskRect, &dst, canOverwriteSrc);
     if (!result) {
         return false;
     }
+    SkAutoUnref aur(dst);
 
+    SkImageInfo info;
     resultBM->setConfig(srcBM.config(), dst->width(), dst->height());
-    resultBM->setPixelRef(SkNEW_ARGS(SkGrPixelRef, (dst)))->unref();
-    dst->unref();
+    if (resultBM->asImageInfo(&info)) {
+        return false;
+    }
+    resultBM->setPixelRef(SkNEW_ARGS(SkGrPixelRef, (info, dst)))->unref();
     return true;
 }
 
 bool SkMaskFilter::filterMaskGPU(GrTexture* src,
                                  const SkRect& maskRect,
                                  GrTexture** result,
                                  bool canOverwriteSrc) const {
     return false;
 }
 #endif
 
 void SkMaskFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
     SkMask  srcM, dstM;
 
     srcM.fImage = NULL;
     src.roundOut(&srcM.fBounds);
     srcM.fRowBytes = 0;
     srcM.fFormat = SkMask::kA8_Format;
 
     SkIPoint margin;    // ignored
     if (this->filterMask(&dstM, srcM, SkMatrix::I(), &margin)) {
         dst->set(dstM.fBounds);
     } else {
         dst->set(srcM.fBounds);
     }
 }