Big Cleanup: SkBitmapFactory, SkLazyPixelRef, SkImageCache

gyp/core.gypi

 # Include this gypi to include all 'core' files
 # The parent gyp/gypi file must define
 #       'skia_src_path'     e.g. skia/trunk/src
 #       'skia_include_path' e.g. skia/trunk/include
 #
 # The skia build defines these in common_variables.gypi
 #
 {
     'sources': [
         '<(skia_src_path)/core/ARGB32_Clamp_Bilinear_BitmapShader.h',
@@ skipping 53 matching lines @@
         '<(skia_src_path)/core/SkCoreBlitters.h',
         '<(skia_src_path)/core/SkCubicClipper.cpp',
         '<(skia_src_path)/core/SkCubicClipper.h',
         '<(skia_src_path)/core/SkData.cpp',
         '<(skia_src_path)/core/SkDataTable.cpp',
         '<(skia_src_path)/core/SkDebug.cpp',
         '<(skia_src_path)/core/SkDeque.cpp',
         '<(skia_src_path)/core/SkDevice.cpp',
         '<(skia_src_path)/core/SkDeviceLooper.cpp',
         '<(skia_src_path)/core/SkDeviceProfile.cpp',
+        '<(skia_src_path)/lazy/SkDiscardableMemoryPool.cpp',
         '<(skia_src_path)/lazy/SkDiscardablePixelRef.cpp',
         '<(skia_src_path)/core/SkDither.cpp',
         '<(skia_src_path)/core/SkDraw.cpp',
         '<(skia_src_path)/core/SkDrawLooper.cpp',
         '<(skia_src_path)/core/SkDrawProcs.h',
         '<(skia_src_path)/core/SkEdgeBuilder.cpp',
         '<(skia_src_path)/core/SkEdgeClipper.cpp',
         '<(skia_src_path)/core/SkEdge.cpp',
         '<(skia_src_path)/core/SkEdge.h',
         '<(skia_src_path)/core/SkError.cpp',
@@ skipping 216 matching lines @@
         '<(skia_include_path)/core/SkTypeface.h',
         '<(skia_include_path)/core/SkTypes.h',
         '<(skia_include_path)/core/SkUnPreMultiply.h',
         '<(skia_include_path)/core/SkUnitMapper.h',
         '<(skia_include_path)/core/SkUtils.h',
         '<(skia_include_path)/core/SkWeakRefCnt.h',
         '<(skia_include_path)/core/SkWriter32.h',
         '<(skia_include_path)/core/SkXfermode.h',
 
         # Lazy decoding:
-        '<(skia_include_path)/lazy/SkBitmapFactory.h',
-        '<(skia_include_path)/lazy/SkImageCache.h',
-        '<(skia_include_path)/lazy/SkLruImageCache.h',
-        '<(skia_include_path)/lazy/SkPurgeableImageCache.h',
-
-        '<(skia_src_path)/lazy/SkBitmapFactory.cpp',
-        '<(skia_src_path)/lazy/SkLazyPixelRef.h',
-        '<(skia_src_path)/lazy/SkLazyPixelRef.cpp',
-        '<(skia_src_path)/lazy/SkLruImageCache.cpp',
-        '<(skia_src_path)/lazy/SkPurgeableMemoryBlock.h',
-        '<(skia_src_path)/lazy/SkPurgeableMemoryBlock_common.cpp',
-        '<(skia_src_path)/lazy/SkPurgeableImageCache.cpp',
-
         '<(skia_src_path)/lazy/SkCachingPixelRef.cpp',
         '<(skia_src_path)/lazy/SkCachingPixelRef.h',
 
         # Path ops
         '<(skia_include_path)/pathops/SkPathOps.h',
 
         '<(skia_src_path)/pathops/SkAddIntersections.cpp',
         '<(skia_src_path)/pathops/SkDCubicIntersection.cpp',
         '<(skia_src_path)/pathops/SkDCubicLineIntersection.cpp',
         '<(skia_src_path)/pathops/SkDCubicToQuads.cpp',
@@ skipping 40 matching lines @@
         '<(skia_src_path)/pathops/SkPathOpsPoint.h',
         '<(skia_src_path)/pathops/SkPathOpsQuad.h',
         '<(skia_src_path)/pathops/SkPathOpsRect.h',
         '<(skia_src_path)/pathops/SkPathOpsTriangle.h',
         '<(skia_src_path)/pathops/SkPathOpsTypes.h',
         '<(skia_src_path)/pathops/SkPathWriter.h',
         '<(skia_src_path)/pathops/SkQuarticRoot.h',
         '<(skia_src_path)/pathops/SkReduceOrder.h',
     ],
 }