From 900c36779610dc65c42a5004ee3693fd70961ba4 Mon Sep 17 00:00:00 2001 From: senorblanco Date: Wed, 27 Apr 2016 11:31:23 -0700 Subject: Image filters: de-nest SkImageFilter::Cache and Cache::Key. This reduces the public header, and also allows us to foward- declare them, so we can remove an #include from all the SkDevice subclass headers. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1919063002 Review-Url: https://codereview.chromium.org/1919063002 --- src/gpu/SkGpuDevice.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/gpu/SkGpuDevice.cpp') diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 3644da4b5a..78b3cfc7d0 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -26,6 +26,7 @@ #include "SkImage_Base.h" #include "SkImageCacherator.h" #include "SkImageFilter.h" +#include "SkImageFilterCache.h" #include "SkLayerInfo.h" #include "SkMaskFilter.h" #include "SkNinePatchIter.h" @@ -1839,11 +1840,11 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* mainCanvas, const SkPicture #endif } -SkImageFilter::Cache* SkGpuDevice::getImageFilterCache() { +SkImageFilterCache* SkGpuDevice::getImageFilterCache() { ASSERT_SINGLE_OWNER // We always return a transient cache, so it is freed after each // filter traversal. - return SkImageFilter::Cache::Create(kDefaultImageFilterCacheSize); + return SkImageFilterCache::Create(kDefaultImageFilterCacheSize); } #endif -- cgit v1.2.3