Image filters: de-nest SkImageFilter::Cache and Cache::Key.

src/core/SkBitmapDevice.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmapDevice.h"
 #include "SkConfig8888.h"
 #include "SkDraw.h"
+#include "SkImageFilterCache.h"
 #include "SkMallocPixelRef.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkPixelRef.h"
 #include "SkPixmap.h"
 #include "SkShader.h"
 #include "SkSurface.h"
 #include "SkXfermode.h"
 
@@ skipping 339 matching lines @@
 
 void SkBitmapDevice::drawDevice(const SkDraw& draw, SkBaseDevice* device,
                                 int x, int y, const SkPaint& paint) {
     draw.drawSprite(static_cast<SkBitmapDevice*>(device)->fBitmap, x, y, paint);
 }
 
 sk_sp<SkSurface> SkBitmapDevice::makeSurface(const SkImageInfo& info, const SkSurfaceProps& props) {
     return SkSurface::MakeRaster(info, &props);
 }
 
-SkImageFilter::Cache* SkBitmapDevice::getImageFilterCache() {
-    SkImageFilter::Cache* cache = SkImageFilter::Cache::Get();
+SkImageFilterCache* SkBitmapDevice::getImageFilterCache() {
+    SkImageFilterCache* cache = SkImageFilterCache::Get();
     cache->ref();
     return cache;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 bool SkBitmapDevice::onShouldDisableLCD(const SkPaint& paint) const {
     if (kN32_SkColorType != fBitmap.colorType() ||
         paint.getRasterizer() ||
         paint.getPathEffect() ||
         paint.isFakeBoldText() ||
         paint.getStyle() != SkPaint::kFill_Style ||
         !SkXfermode::IsMode(paint.getXfermode(), SkXfermode::kSrcOver_Mode))
     {
         return true;
     }
     return false;
 }