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

Source/WebCore/platform/image-decoders/webp/WEBPImageDecoder.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 61 matching lines @@
 
 bool WEBPImageDecoder::decode(bool onlySize)
 {
     // Minimum number of bytes needed to ensure one can parse size information.
     static const size_t sizeOfHeader = 30;
     // Number of bytes per pixel.
     static const int bytesPerPixel = 3;
 
     if (failed())
         return false;
-    const size_t dataSize = m_data->buffer().size();
+    const size_t dataSize = m_data->size();
     const uint8_t* dataBytes =
-        reinterpret_cast<const uint8_t*>(m_data->buffer().data());
+        reinterpret_cast<const uint8_t*>(m_data->data());
     int width, height;
     if (dataSize < sizeOfHeader)
         return true;
     if (!WebPGetInfo(dataBytes, dataSize, &width, &height))
         return setFailed();
     if (!ImageDecoder::isSizeAvailable() && !setSize(width, height))
         return setFailed();
     if (onlySize)
         return true;
 
@@ skipping 21 matching lines @@
     }
     buffer.setStatus(ImageFrame::FrameComplete);
     buffer.setHasAlpha(false);
     buffer.setRect(IntRect(IntPoint(), size()));
     return true;
 }
 
 }
 
 #endif