Merges your change (WebKit cl 39396) to the ImageDecoders into our

port. These are port classes, so they have to be hand merged.

BUG=5827
TEST=none

Review URL: http://codereview.chromium.org/17437

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

8 files changed, 19 insertions, 8 deletions

diff --git a/webkit/port/platform/image-decoders/ImageDecoder.h b/webkit/port/platform/image-decoders/ImageDecoder.h
index f13c055..617bb54 100644
--- a/webkit/port/platform/image-decoders/ImageDecoder.h
+++ b/webkit/port/platform/image-decoders/ImageDecoder.h
@@ -30,6 +30,7 @@
 #include "IntRect.h"
 #include "ImageSource.h"
 #include "NativeImageSkia.h"
+#include "PlatformString.h"
 #include "SharedBuffer.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
@@ -228,6 +229,9 @@ public:
     ImageDecoder() : m_failed(false), m_sizeAvailable(false)  {}
     virtual ~ImageDecoder() {}
 
+    // The the filename extension usually associated with an undecoded image of this type.
+    virtual String filenameExtension() const = 0;
+
     // All specific decoder plugins must do something with the data they are given.
     virtual void setData(SharedBuffer* data, bool allDataReceived) { m_data = data; }
 
diff --git a/webkit/port/platform/image-decoders/bmp/BMPImageDecoder.h b/webkit/port/platform/image-decoders/bmp/BMPImageDecoder.h
index 846d666..36da7b5 100644
--- a/webkit/port/platform/image-decoders/bmp/BMPImageDecoder.h
+++ b/webkit/port/platform/image-decoders/bmp/BMPImageDecoder.h
@@ -13,6 +13,8 @@ namespace WebCore {
 class BMPImageDecoder : public BMPImageReader
 {
 public:
+    virtual String filenameExtension() const { return "bmp"; }
+
     // BMPImageReader
     virtual void decodeImage(SharedBuffer* data);
 
diff --git a/webkit/port/platform/image-decoders/gif/GIFImageDecoder.h b/webkit/port/platform/image-decoders/gif/GIFImageDecoder.h
index a8b16df..4b7096f 100644
--- a/webkit/port/platform/image-decoders/gif/GIFImageDecoder.h
+++ b/webkit/port/platform/image-decoders/gif/GIFImageDecoder.h
@@ -39,6 +39,8 @@ public:
     GIFImageDecoder();
     ~GIFImageDecoder();
 
+    virtual String filenameExtension() const { return "gif"; }
+
     // Take the data and store it.
     virtual void setData(SharedBuffer* data, bool allDataReceived);
 
diff --git a/webkit/port/platform/image-decoders/ico/ICOImageDecoder.h b/webkit/port/platform/image-decoders/ico/ICOImageDecoder.h
index a459ca3..0094e51 100644
--- a/webkit/port/platform/image-decoders/ico/ICOImageDecoder.h
+++ b/webkit/port/platform/image-decoders/ico/ICOImageDecoder.h
@@ -22,6 +22,8 @@ public:
         m_andMaskState = NOT_YET_DECODED;
     }
 
+    virtual String filenameExtension() const { return "ico"; }
+
     // BMPImageReader
     virtual void decodeImage(SharedBuffer* data);
     virtual RGBA32Buffer* frameBufferAtIndex(size_t index);
diff --git a/webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.h b/webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.h
index 1dbf29e..c4bd234 100644
--- a/webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.h
+++ b/webkit/port/platform/image-decoders/jpeg/JPEGImageDecoder.h
@@ -39,6 +39,8 @@ public:
     JPEGImageDecoder();
     ~JPEGImageDecoder();
 
+    virtual String filenameExtension() const { return "jpg"; }
+
     // Take the data and store it.
     virtual void setData(SharedBuffer* data, bool allDataReceived);
 
diff --git a/webkit/port/platform/image-decoders/png/PNGImageDecoder.h b/webkit/port/platform/image-decoders/png/PNGImageDecoder.h
index fb4e500..f7aa728 100644
--- a/webkit/port/platform/image-decoders/png/PNGImageDecoder.h
+++ b/webkit/port/platform/image-decoders/png/PNGImageDecoder.h
@@ -39,6 +39,8 @@ public:
     PNGImageDecoder();
     ~PNGImageDecoder();
 
+    virtual String filenameExtension() const { return "png"; }
+
     // Take the data and store it.
     virtual void setData(SharedBuffer* data, bool allDataReceived);
 
diff --git a/webkit/port/platform/image-decoders/xbm/XBMImageDecoder.h b/webkit/port/platform/image-decoders/xbm/XBMImageDecoder.h
index d8bb174..28ad6b0 100644
--- a/webkit/port/platform/image-decoders/xbm/XBMImageDecoder.h
+++ b/webkit/port/platform/image-decoders/xbm/XBMImageDecoder.h
@@ -38,6 +38,9 @@ class XBMImageDecoder : public ImageDecoder
 public:
     XBMImageDecoder();
     virtual ~XBMImageDecoder() {}
+
+    virtual String filenameExtension() const { return "xbm"; }
+
     virtual void setData(SharedBuffer* data, bool allDataReceived);
     // Whether or not the size information has been decoded yet.
     virtual bool isSizeAvailable() const;
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index fc8e865..3604d54 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1767,14 +1767,8 @@ MAC : LayoutTests/transforms/2d/transform-value-types.html = FAIL
 // once we turn on DOM_STORAGE.
 SKIP : LayoutTests/http/tests/navigation/post-goback-repost-policy.html = TIMEOUT
 
-// These are failing until Adam's patch to ImageDecoder is merged and we
-// update ImageSource. See bug 5827.
-LINUX WIN DEBUG : LayoutTests/editing/pasteboard/4947130.html = CRASH
-LINUX WIN DEBUG : LayoutTests/editing/pasteboard/drag-image-in-about-blank-frame.html = CRASH
-LINUX WIN DEBUG : LayoutTests/editing/pasteboard/drag-image-to-contenteditable-in-iframe.html = CRASH
-LINUX WIN DEBUG : LayoutTests/editing/pasteboard/drag-selected-image-to-contenteditable.html = CRASH
-LINUX WIN DEBUG : LayoutTests/editing/selection/drag-to-contenteditable-iframe.html = CRASH
-LINUX WIN DEBUG : LayoutTests/fast/events/standalone-image-drag-to-editable.html = CRASH
+// This is failing because of an additional console message.
+LINUX WIN DEBUG : LayoutTests/fast/events/standalone-image-drag-to-editable.html = FAIL
 
 // eventSender to fake a drag
 MAC DEBUG : LayoutTests/fast/events/standalone-image-drag-to-editable.html = FAIL