WebKit update 44626:44645

* <http://trac.webkit.org/changeset/44634>:

Moves the skia image decoder files out of "skia/" and into {"png/", "bmp/", "ico/", "jpeg/", "xbm/"}. 

I made the corresponding updates to webkit.gyp.

The semantics of "don't use skia decoders on Mac" should still be in effect.

* <http://trac.webkit.org/changeset/44636>

This adds a new file, V8StorageCustom.cpp, which I HAVE NOT pulled into webit.gyp.

There is a chromium-side component to this, which jorlow will take care when he is ready to pull the file into our build.
Review URL: http://codereview.chromium.org/126085

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18345 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 24 insertions, 35 deletions

diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index effc4bd..d489504 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -53,7 +53,13 @@
       '../third_party/WebKit/WebCore/platform/graphics/opentype',
       '../third_party/WebKit/WebCore/platform/graphics/skia',
       '../third_party/WebKit/WebCore/platform/graphics/transforms',
+      '../third_party/WebKit/WebCore/platform/image-decoders/bmp',
+      '../third_party/WebKit/WebCore/platform/image-decoders/gif',
+      '../third_party/WebKit/WebCore/platform/image-decoders/ico',
+      '../third_party/WebKit/WebCore/platform/image-decoders/jpeg',
+      '../third_party/WebKit/WebCore/platform/image-decoders/png',
       '../third_party/WebKit/WebCore/platform/image-decoders/skia',
+      '../third_party/WebKit/WebCore/platform/image-decoders/xbm',
       '../third_party/WebKit/WebCore/platform/image-encoders/skia',
       '../third_party/WebKit/WebCore/platform/network',
       '../third_party/WebKit/WebCore/platform/network/chromium',
@@ -2536,6 +2542,8 @@
         '../third_party/WebKit/WebCore/platform/gtk/guriescape.h',
         '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp',
         '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h',
+        '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp',
+        '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageReader.h',
         '../third_party/WebKit/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp',
         '../third_party/WebKit/WebCore/platform/image-decoders/gif/GIFImageDecoder.h',
         '../third_party/WebKit/WebCore/platform/image-decoders/gif/GIFImageReader.cpp',
@@ -2546,23 +2554,7 @@
         '../third_party/WebKit/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h',
         '../third_party/WebKit/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp',
         '../third_party/WebKit/WebCore/platform/image-decoders/png/PNGImageDecoder.h',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/BMPImageDecoder.cpp',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/BMPImageDecoder.h',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/BMPImageReader.cpp',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/BMPImageReader.h',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/GIFImageDecoder.cpp',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/GIFImageDecoder.h',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/GIFImageReader.cpp',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/GIFImageReader.h',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/ICOImageDecoder.cpp',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/ICOImageDecoder.h',
         '../third_party/WebKit/WebCore/platform/image-decoders/skia/ImageDecoder.h',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/JPEGImageDecoder.cpp',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/JPEGImageDecoder.h',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/PNGImageDecoder.cpp',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/PNGImageDecoder.h',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/XBMImageDecoder.cpp',
-        '../third_party/WebKit/WebCore/platform/image-decoders/skia/XBMImageDecoder.h',
         '../third_party/WebKit/WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp',
         '../third_party/WebKit/WebCore/platform/image-decoders/xbm/XBMImageDecoder.h',
         '../third_party/WebKit/WebCore/platform/image-decoders/zlib/crc32.h',
@@ -3838,9 +3830,6 @@
         ['exclude', '/third_party/WebKit/WebCore/svg/Filter[^/]*\\.cpp$'],
         ['exclude', '/third_party/WebKit/WebCore/svg/SVG(FE|Filter)[^/]*\\.cpp$'],
 
-        # Only use platform/image-decoders/skia.
-        ['exclude', '/third_party/WebKit/WebCore/platform/image-decoders/(?!skia/)'],
-
         # Exclude some, but not all, of storage.
         ['exclude', '/third_party/WebKit/WebCore/storage/(Local|Session)Storage[^/]*\\.cpp$'],
       ],
@@ -4108,23 +4097,23 @@
 
             # Skia image-decoders are also not used on mac.  CoreGraphics
             # is used directly instead.
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/BMPImageDecoder.cpp',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/BMPImageDecoder.h',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/BMPImageReader.cpp',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/BMPImageReader.h',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/GIFImageDecoder.cpp',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/GIFImageDecoder.h',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/GIFImageReader.cpp',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/GIFImageReader.h',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/ICOImageDecoder.cpp',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/ICOImageDecoder.h',
+            '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageDecoder.cpp',
+            '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageDecoder.h',
+            '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageReader.cpp',
+            '../third_party/WebKit/WebCore/platform/image-decoders/bmp/BMPImageReader.h',
+            '../third_party/WebKit/WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp',
+            '../third_party/WebKit/WebCore/platform/image-decoders/gif/GIFImageDecoder.h',
+            '../third_party/WebKit/WebCore/platform/image-decoders/gif/GIFImageReader.cpp',
+            '../third_party/WebKit/WebCore/platform/image-decoders/gif/GIFImageReader.h',
+            '../third_party/WebKit/WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp',
+            '../third_party/WebKit/WebCore/platform/image-decoders/ico/ICOImageDecoder.h',
+            '../third_party/WebKit/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp',
+            '../third_party/WebKit/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.h',
+            '../third_party/WebKit/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp',
+            '../third_party/WebKit/WebCore/platform/image-decoders/png/PNGImageDecoder.h',
             '../third_party/WebKit/WebCore/platform/image-decoders/skia/ImageDecoder.h',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/JPEGImageDecoder.cpp',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/JPEGImageDecoder.h',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/PNGImageDecoder.cpp',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/PNGImageDecoder.h',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/XBMImageDecoder.cpp',
-            '../third_party/WebKit/WebCore/platform/image-decoders/skia/XBMImageDecoder.h',
+            '../third_party/WebKit/WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp',
+            '../third_party/WebKit/WebCore/platform/image-decoders/xbm/XBMImageDecoder.h',
           ],
           'link_settings': {
             'libraries': [