Retract SkDevice a bit more

src/gpu/GrLayerHoister.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
+#include "GrContext.h"
 #include "GrLayerCache.h"
 #include "GrLayerHoister.h"
 #include "GrRecordReplaceDraw.h"
 
 #include "SkBigPicture.h"
 #include "SkCanvas.h"
-#include "SkGpuDevice.h"
 #include "SkLayerInfo.h"
 #include "SkRecordDraw.h"
 #include "SkSpecialImage.h"
 #include "SkSurface.h"
-#include "SkSurface_Gpu.h"
 
 // Create the layer information for the hoisted layer and secure the
 // required texture/render target resources.
 static void prepare_for_hoisting(GrLayerCache* layerCache,
                                  const SkPicture* topLevelPicture,
                                  const SkMatrix& initialMat,
                                  const SkLayerInfo::BlockInfo& info,
                                  const SkIRect& srcIR,
                                  const SkIRect& dstIR,
                                  SkTDArray<GrHoistedLayer>* needRendering,
@@ skipping 241 matching lines @@
 
             pict->partialPlayback(atlasCanvas, layer->start() + 1, layer->stop(), initialCTM);
             atlasCanvas->restore();
         }
 
         atlasCanvas->flush();
     }
 }
 
 void GrLayerHoister::FilterLayer(GrContext* context,
-                                 SkGpuDevice* device,
+                                 const SkSurfaceProps* props,
                                  const GrHoistedLayer& info) {
     GrCachedLayer* layer = info.fLayer;
 
     SkASSERT(layer->filter());
 
     static const int kDefaultCacheSize = 32 * 1024 * 1024;
 
     const SkIPoint filterOffset = SkIPoint::Make(layer->srcIR().fLeft, layer->srcIR().fTop);
 
     SkMatrix totMat(info.fPreMat);
     totMat.preConcat(info.fLocalMat);
     totMat.postTranslate(-SkIntToScalar(filterOffset.fX), -SkIntToScalar(filterOffset.fY));
 
     SkASSERT(0 == layer->rect().fLeft && 0 == layer->rect().fTop);
     const SkIRect& clipBounds = layer->rect();
 
     // This cache is transient, and is freed (along with all its contained
     // textures) when it goes out of scope.
     SkAutoTUnref<SkImageFilter::Cache> cache(SkImageFilter::Cache::Create(kDefaultCacheSize));
     SkImageFilter::Context filterContext(totMat, clipBounds, cache);
 
     // TODO: should the layer hoister store stand alone layers as SkSpecialImages internally?
     const SkIRect subset = SkIRect::MakeWH(layer->texture()->width(), layer->texture()->height());
     sk_sp<SkSpecialImage> img(SkSpecialImage::MakeFromGpu(subset,
                                                           kNeedNewImageUniqueID_SpecialImage,
                                                           layer->texture(),
-                                                          &device->surfaceProps()));
+                                                          props));
 
     SkIPoint offset = SkIPoint::Make(0, 0);
     sk_sp<SkSpecialImage> result(layer->filter()->filterImage(img.get(),
                                                               filterContext,
                                                               &offset));
     if (!result) {
         // Filtering failed. Press on with the unfiltered version.
         return;
     }
 
@@ skipping 32 matching lines @@
         initialCTM.setTranslate(SkIntToScalar(-offset.fX), SkIntToScalar(-offset.fY));
         initialCTM.preConcat(layers[i].fPreMat);
 
         layerCanvas->setMatrix(initialCTM);
         layerCanvas->concat(layers[i].fLocalMat);
 
         pict->partialPlayback(layerCanvas, layer->start()+1, layer->stop(), initialCTM);
         layerCanvas->flush();
 
         if (layer->filter()) {
-            SkSurface_Gpu* gpuSurf = static_cast<SkSurface_Gpu*>(surface.get());
-
-            FilterLayer(context, gpuSurf->getDevice(), layers[i]);
+            FilterLayer(context, &surface->props(), layers[i]);
         }
     }
 }
 
 void GrLayerHoister::UnlockLayers(GrContext* context,
                                   const SkTDArray<GrHoistedLayer>& layers) {
     GrLayerCache* layerCache = context->getLayerCache();
 
     for (int i = 0; i < layers.count(); ++i) {
         layerCache->removeUse(layers[i].fLayer);
@@ skipping 14 matching lines @@
 #if !GR_CACHE_HOISTED_LAYERS
 
     // This code completely clears out the atlas. It is required when
     // caching is disabled so the atlas doesn't fill up and force more
     // free floating layers
     layerCache->purgeAll();
 #endif
 
     layerCache->end();
 }