Refactoring in SkImage implementations backed by a SkBitmap

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/SkAAClip.cpp',
@@ skipping 201 matching lines @@
         '<(skia_src_path)/core/SkValidatingReadBuffer.cpp',
         '<(skia_src_path)/core/SkVertState.cpp',
         '<(skia_src_path)/core/SkWriteBuffer.cpp',
         '<(skia_src_path)/core/SkWriter32.cpp',
         '<(skia_src_path)/core/SkXfermode.cpp',
 
         '<(skia_src_path)/doc/SkDocument.cpp',
 
         '<(skia_src_path)/image/SkImage.cpp',
         '<(skia_src_path)/image/SkImagePriv.cpp',
-        '<(skia_src_path)/image/SkImage_Codec.cpp',
+        '<(skia_src_path)/image/SkImage_Base.h',
+        '<(skia_src_path)/image/SkImage_BitmapBase.cpp',
+        '<(skia_src_path)/image/SkImage_BitmapBase.h',
 #        '<(skia_src_path)/image/SkImage_Gpu.cpp',
         '<(skia_src_path)/image/SkImage_Raster.cpp',
         '<(skia_src_path)/image/SkSurface.cpp',
         '<(skia_src_path)/image/SkSurface_Base.h',
 #        '<(skia_src_path)/image/SkSurface_Gpu.cpp',
         '<(skia_src_path)/image/SkSurface_Raster.cpp',
 
         '<(skia_src_path)/pipe/SkGPipeRead.cpp',
         '<(skia_src_path)/pipe/SkGPipeWrite.cpp',
 
@@ skipping 138 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',
     ],
 }