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

include/core/SkBitmapDevice.h

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkBitmapDevice_DEFINED
 #define SkBitmapDevice_DEFINED
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkDevice.h"
-#include "SkImageFilter.h"
 #include "SkImageInfo.h"
 #include "SkRect.h"
 #include "SkScalar.h"
 #include "SkSize.h"
 #include "SkSurfaceProps.h"
 #include "SkTypes.h"
 
 class SkDraw;
+class SkImageFilterCache;
 class SkMatrix;
 class SkPaint;
 class SkPath;
 class SkPixelRef;
 class SkPixmap;
 class SkRRect;
 class SkSurface;
 class SkXfermode;
 struct SkPoint;
 
@@ skipping 120 matching lines @@
 
     // used to change the backend's pixels (and possibly config/rowbytes)
     // but cannot change the width/height, so there should be no change to
     // any clip information.
     void replaceBitmapBackendForRasterSurface(const SkBitmap&) override;
 
     SkBaseDevice* onCreateDevice(const CreateInfo&, const SkPaint*) override;
 
     sk_sp<SkSurface> makeSurface(const SkImageInfo&, const SkSurfaceProps&) override;
 
-    SkImageFilter::Cache* getImageFilterCache() override;
+    SkImageFilterCache* getImageFilterCache() override;
 
     SkBitmap    fBitmap;
 
     void setNewSize(const SkISize&);  // Used by SkCanvas for resetForNextPicture().
 
     typedef SkBaseDevice INHERITED;
 };
 
 #endif // SkBitmapDevice_DEFINED