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

skia/ext/vector_canvas_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 "build/build_config.h"
 
 #include "webkit/tools/test_shell/image_decoder_unittest.h"
 
 #if !defined(OS_WIN)
 #include <unistd.h>
@@ skipping 63 matching lines @@
 // It is mainly used for comparison.
 class Image {
  public:
   // Creates the image from the given filename on disk.
   Image(const std::wstring& filename) : ignore_alpha_(true) {
     Vector<char> compressed;
     ReadFileToVector(filename, &compressed);
     EXPECT_TRUE(compressed.size());
     WebCore::PNGImageDecoder decoder;
     decoder.setData(WebCore::SharedBuffer::adoptVector(compressed).get(), true);
-    SetSkBitmap(decoder.frameBufferAtIndex(0)->bitmap());
+    scoped_ptr<NativeImageSkia> image_data(
+        decoder.frameBufferAtIndex(0)->asNewNativeImage());
+    SetSkBitmap(*image_data);
   }
 
   // Loads the image from a canvas.
   Image(const skia::PlatformCanvasWin& canvas) : ignore_alpha_(true) {
     // Use a different way to access the bitmap. The normal way would be to
     // query the SkBitmap.
     HDC context = canvas.getTopPlatformDevice().getBitmapDC();
     HGDIOBJ bitmap = GetCurrentObject(context, OBJ_BITMAP);
     EXPECT_TRUE(bitmap != NULL);
     // Initialize the clip region to the entire bitmap.
@@ skipping 223 matching lines @@
 }
 
 void LoadPngFileToSkBitmap(const std::wstring& filename,
                            SkBitmap* bitmap,
                            bool is_opaque) {
   Vector<char> compressed;
   ReadFileToVector(filename, &compressed);
   EXPECT_TRUE(compressed.size());
   WebCore::PNGImageDecoder decoder;
   decoder.setData(WebCore::SharedBuffer::adoptVector(compressed).get(), true);
-  *bitmap = decoder.frameBufferAtIndex(0)->bitmap();
+  scoped_ptr<NativeImageSkia> image_data(
+      decoder.frameBufferAtIndex(0)->asNewNativeImage());
+  *bitmap = *image_data;
   EXPECT_EQ(is_opaque, bitmap->isOpaque());
   Premultiply(*bitmap);
 }
 
 }  // namespace
 
 // Streams an image.
 inline std::ostream& operator<<(std::ostream& out, const Image& image) {
   return out << "Image(" << image.width() << ", "
              << image.height() << ", " << image.row_length() << ")";
@@ skipping 613 matching lines @@
   {
     vcanvas_->rotate(67);
     pcanvas_->rotate(67);
     vcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     pcanvas_->drawBitmap(bitmap, 20, -50, NULL);
     EXPECT_EQ(0., ProcessImage(L"rotate"));
   }
 }
 
 }  // namespace skia