post-commit fixes to applyFilter CL

src/image/SkImage_Gpu.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapCache.h"
 #include "SkImage_Gpu.h"
 #include "GrCaps.h"
@@ skipping 168 matching lines @@
     if (!subTx) {
         return nullptr;
     }
     ctx->copySurface(subTx, fTexture, subset, SkIPoint::Make(0, 0));
     return new SkImage_Gpu(desc.fWidth, desc.fHeight, kNeedNewImageUniqueID, fAlphaType, subTx,
                            fBudgeted);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "SkBitmapDevice.h"
 #include "SkGrPixelRef.h"
 #include "SkImageFilter.h"
 
 class SkGpuImageFilterProxy : public SkImageFilter::Proxy {
     GrContext* fCtx;
 
 public:
     SkGpuImageFilterProxy(GrContext* ctx) : fCtx(ctx) {}
 
     SkBaseDevice* createDevice(int width, int height) override {
@@ skipping 20 matching lines @@
         return false;
     }
 };
 
 SkImage* SkImage_Gpu::onApplyFilter(SkImageFilter* filter, SkIPoint* offsetResult,
                                     bool forceResultToOriginalSize) const {
     if (!forceResultToOriginalSize || !filter->canFilterImageGPU()) {
         return this->INHERITED::onApplyFilter(filter, offsetResult, forceResultToOriginalSize);
     }
 
-    const SkImageInfo info = make_info(this->width(), this->height(), this->isOpaque());
-    SkAutoTUnref<SkGrPixelRef> pr(new SkGrPixelRef(info, fTexture));
     SkBitmap src;
-    src.setInfo(info);
-    src.setPixelRef(pr, 0, 0);
+    GrWrapTextureInBitmap(fTexture, this->width(), this->height(), this->isOpaque(), &src);
 
     GrContext* context = fTexture->getContext();
     SkGpuImageFilterProxy proxy(context);
     SkImageFilter::Context ctx(SkMatrix::I(),
                                SkIRect::MakeWH(this->width(), this->height()),
                                SkImageFilter::Cache::Get());
 
     SkBitmap dst;
     if (filter->filterImageGPU(&proxy, src, ctx, &dst, offsetResult)) {
-        return new SkImage_Gpu(dst.width(), dst.height(), kNeedNewImageUniqueID, info.alphaType(),
+        return new SkImage_Gpu(dst.width(), dst.height(), kNeedNewImageUniqueID, dst.alphaType(),
                                dst.getTexture(), SkSurface::kNo_Budgeted);
     }
     return nullptr;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 static SkImage* new_wrapped_texture_common(GrContext* ctx, const GrBackendTextureDesc& desc,
                                            SkAlphaType at, GrWrapOwnership ownership,
                                            SkImage::TextureReleaseProc releaseProc,
@@ skipping 134 matching lines @@
     if (!dst) {
         return nullptr;
     }
     
     const SkIRect srcR = SkIRect::MakeWH(desc.fWidth, desc.fHeight);
     const SkIPoint dstP = SkIPoint::Make(0, 0);
     ctx->copySurface(dst, src, srcR, dstP, GrContext::kFlushWrites_PixelOp);
     return dst;
 }