diff options
| author |  reed <reed@google.com> | 2015-06-09 08:18:39 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-09 08:18:40 -0700 |
| commit | 2c55d7b7f3c2c834085d019bf6b1519b315c8aa1 (patch) | |
| tree | e8b584e6f7f085132c2333e87b060e65f7f77ca8 /src/gpu | |
| parent | ded9a6f794a43fc9ec7b370559ba0699c061628d (diff) | |
remove subclassing from ImageFilter::Proxy
BUG=skia:
Review URL: https://codereview.chromium.org/1172693002
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrLayerHoister.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/gpu/GrLayerHoister.cpp b/src/gpu/GrLayerHoister.cpp index 67e3c19a2f..5cc5fa3c02 100644 --- a/src/gpu/GrLayerHoister.cpp +++ b/src/gpu/GrLayerHoister.cpp @@ -11,7 +11,6 @@ #include "SkBigPicture.h" #include "SkCanvas.h" -#include "SkDeviceImageFilterProxy.h" #include "SkDeviceProperties.h" #include "SkGpuDevice.h" #include "SkGrPixelRef.h" @@ -315,7 +314,7 @@ void GrLayerHoister::FilterLayer(GrContext* context, SkAutoTUnref<SkImageFilter::Cache> cache(SkImageFilter::Cache::Create(kDefaultCacheSize)); SkImageFilter::Context filterContext(totMat, clipBounds, cache); - SkDeviceImageFilterProxy proxy(device, SkSurfaceProps(0, kUnknown_SkPixelGeometry)); + SkImageFilter::Proxy proxy(device, SkSurfaceProps(0, kUnknown_SkPixelGeometry)); const SkBitmap src = wrap_texture(layer->texture()); if (!layer->filter()->filterImage(&proxy, src, filterContext, &filteredBitmap, &offset)) { diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index beed2fab28..8bd5b5ebd5 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -18,7 +18,6 @@ #include "GrTextContext.h" #include "GrTracing.h" #include "SkCanvasPriv.h" -#include "SkDeviceImageFilterProxy.h" #include "SkDrawProcs.h" #include "SkErrorInternals.h" #include "SkGlyphCache.h" @@ -1243,7 +1242,7 @@ bool SkGpuDevice::filterTexture(GrContext* context, GrTexture* texture, // FIXME: plumb actual surface props such that we don't have to lie about the flags here // (https://code.google.com/p/skia/issues/detail?id=3148). - SkDeviceImageFilterProxy proxy(this, SkSurfaceProps(0, getLeakyProperties().pixelGeometry())); + SkImageFilter::Proxy proxy(this, SkSurfaceProps(0, getLeakyProperties().pixelGeometry())); if (filter->canFilterImageGPU()) { return filter->filterImageGPU(&proxy, wrap_texture(texture, width, height), |