Merge 78548 - 2011-02-15 Gavin Peters <gavinp@chromium.org>...

Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

Index: Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
===================================================================
--- Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp	(revision 78612)
+++ Source/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp	(working copy)
@@ -179,7 +179,7 @@
         m_bytesToSkip = std::max(numBytes - bytesToSkip, static_cast<long>(0));
     }
 
-    bool decode(const Vector<char>& data, bool onlySize)
+    bool decode(const SharedBuffer& data, bool onlySize)
     {
         m_decodingSizeOnly = onlySize;
 
@@ -526,7 +526,7 @@
 
     // If we couldn't decode the image but we've received all the data, decoding
     // has failed.
-    if (!m_reader->decode(m_data->buffer(), onlySize) && isAllDataReceived())
+    if (!m_reader->decode(*m_data, onlySize) && isAllDataReceived())
         setFailed();
     // If we're done decoding the image, we don't need the JPEGImageReader
     // anymore.  (If we failed, |m_reader| has already been cleared.)