Update DEPS to pull in upstream change that removes RGBA32Buffer::bitmap(), a...

webkit/tools/test_shell/image_decoder_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "webkit/tools/test_shell/image_decoder_unittest.h"
 
 #include "base/file_util.h"
 #include "base/md5.h"
@@ skipping 28 matching lines @@
   memcpy(&contents->first(), contents_str.data(), contents_str.size());
 }
 
 std::wstring GetMD5SumPath(const std::wstring& path) {
   static const std::wstring kDecodedDataExtension(L".md5sum");
   return path + kDecodedDataExtension;
 }
 
 #ifdef CALCULATE_MD5_SUMS
 void SaveMD5Sum(const std::wstring& path, WebCore::RGBA32Buffer* buffer) {
-  // Create the file to write.
-  ScopedHandle handle(CreateFile(path.c_str(), GENERIC_WRITE, 0,
-                                 NULL, CREATE_ALWAYS,
-                                 FILE_ATTRIBUTE_NORMAL, NULL));
-  ASSERT_TRUE(handle.IsValid());
-
   // Calculate MD5 sum.
   MD5Digest digest;
-  SkAutoLockPixels bmp_lock(buffer->bitmap());
-  MD5Sum(buffer->bitmap().getPixels(),
-         buffer->rect().width() * buffer->rect().height() * sizeof(unsigned),
-         &digest);
+  scoped_ptr<NativeImageSkia> image_data(buffer->asNewNativeImage());
+  {
+    SkAutoLockPixels bmp_lock(*image_data);
+    MD5Sum(image_data->getPixels(),
+           image_data->width() * image_data->height() * sizeof(uint32_t),
+           &digest);
+  }
 
   // Write sum to disk.
-  int bytes_written = file_util::WriteFile(path, &digest, sizeof digest);
+  int bytes_written = file_util::WriteFile(path,
+      reinterpret_cast<const char*>(&digest), sizeof digest);
   ASSERT_EQ(sizeof digest, bytes_written);
 }
 #else
 void VerifyImage(WebCore::ImageDecoder* decoder,
                  const std::wstring& path,
                  const std::wstring& md5_sum_path) {
   // Make sure decoding can complete successfully.
   EXPECT_TRUE(decoder->isSizeAvailable()) << path;
   WebCore::RGBA32Buffer* image_buffer = decoder->frameBufferAtIndex(0);
   ASSERT_NE(static_cast<WebCore::RGBA32Buffer*>(NULL), image_buffer) << path;
   EXPECT_EQ(WebCore::RGBA32Buffer::FrameComplete, image_buffer->status()) <<
       path;
   EXPECT_FALSE(decoder->failed()) << path;
 
   // Calculate MD5 sum.
   MD5Digest actual_digest;
-  SkAutoLockPixels bmp_lock(image_buffer->bitmap());
-  MD5Sum(image_buffer->bitmap().getPixels(), image_buffer->rect().width() *
-      image_buffer->rect().height() * sizeof(unsigned), &actual_digest);
+  scoped_ptr<NativeImageSkia> image_data(image_buffer->asNewNativeImage());
+  {
+    SkAutoLockPixels bmp_lock(*image_data);
+    MD5Sum(image_data->getPixels(),
+           image_data->width() * image_data->height() * sizeof(uint32_t),
+           &actual_digest);
+  }
 
   // Read the MD5 sum off disk.
   std::string file_bytes;
   file_util::ReadFileToString(md5_sum_path, &file_bytes);
   MD5Digest expected_digest;
   ASSERT_EQ(sizeof expected_digest, file_bytes.size()) << path;
   memcpy(&expected_digest, file_bytes.data(), sizeof expected_digest);
 
   // Verify that the sums are the same.
   EXPECT_EQ(0, memcmp(&expected_digest, &actual_digest, sizeof(MD5Digest))) <<
@@ skipping 113 matching lines @@
 
     // Make sure passing the complete image results in successful decoding.
     partial_contents->append(
         &image_contents.data()[partial_size],
         static_cast<int>(image_contents.size() - partial_size));
     decoder->setData(partial_contents.get(), true);
     VerifyImage(decoder.get(), *i, GetMD5SumPath(*i));
   }
 }
 #endif