Updates to images project.

gyp/images.gyp

-{
+{
   'targets': [
     {
       'target_name': 'images',
       'product_name': 'skia_images',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'libjpeg.gyp:*',
         'libwebp.gyp:libwebp',
         'utils.gyp:utils',
@@ skipping 17 matching lines @@
         '../src/images/SkJpegUtility.h',
         '../include/images/SkMovie.h',
         '../include/images/SkPageFlipper.h',
 
         '../src/images/bmpdecoderhelper.cpp',
         '../src/images/bmpdecoderhelper.h',
 
         '../src/images/SkBitmapRegionDecoder.cpp',
 
         '../src/images/SkImageDecoder.cpp',
-        '../src/images/SkImageDecoder_Factory.cpp',
+        '../src/images/SkImageDecoder_FactoryDefault.cpp',
+        '../src/images/SkImageDecoder_FactoryRegistrar.cpp',
         '../src/images/SkImageDecoder_libbmp.cpp',
         '../src/images/SkImageDecoder_libgif.cpp',
         '../src/images/SkImageDecoder_libico.cpp',
         '../src/images/SkImageDecoder_libjpeg.cpp',
         '../src/images/SkImageDecoder_libpng.cpp',
         '../src/images/SkImageDecoder_libwebp.cpp',
         '../src/images/SkImageDecoder_wbmp.cpp',
         '../src/images/SkImageEncoder.cpp',
         '../src/images/SkImageEncoder_Factory.cpp',
         '../src/images/SkImageRef.cpp',
@@ skipping 10 matching lines @@
         '../src/images/SkScaledBitmapSampler.cpp',
         '../src/images/SkScaledBitmapSampler.h',
 
         '../src/ports/SkImageDecoder_CG.cpp',
         '../src/ports/SkImageDecoder_WIC.cpp',
       ],
       'conditions': [
         [ 'skia_os == "win"', {
           'sources!': [
             '../src/images/SkFDStream.cpp',
-            '../src/images/SkImageDecoder_Factory.cpp',
+            '../src/images/SkImageDecoder_FactoryDefault.cpp',
             '../src/images/SkImageDecoder_libgif.cpp',
             '../src/images/SkImageDecoder_libpng.cpp',
-            '../src/images/SkImageEncoder_Factory.cpp',
             '../src/images/SkMovie_gif.cpp',
           ],
           'link_settings': {
             'libraries': [
               'windowscodecs.lib',
             ],
           },
         },{ #else if skia_os != win
           'sources!': [
             '../src/ports/SkImageDecoder_WIC.cpp',
           ],
         }],
         [ 'skia_os in ["mac", "ios"]', {
           'sources!': [
-            '../src/images/SkImageDecoder_Factory.cpp',
+            '../src/images/SkImageDecoder_FactoryDefault.cpp',
             '../src/images/SkImageDecoder_libpng.cpp',
             '../src/images/SkImageDecoder_libgif.cpp',
-            '../src/images/SkImageEncoder_Factory.cpp',
             '../src/images/SkMovie_gif.cpp',
           ],
         },{ #else if skia_os != mac
           'sources!': [
             '../src/ports/SkImageDecoder_CG.cpp',
           ],
         }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
           # Any targets that depend on this target should link in libpng, libgif, and
           # our code that calls it.
@@ skipping 56 matching lines @@
       },
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: