Roll Skia DEPS to r12910

skia/ext/bitmap_platform_device_win.cc

 // Copyright (c) 2012 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 <windows.h>
 #include <psapi.h>
 
 #include "base/logging.h"
 #include "base/debug/alias.h"
 #include "skia/ext/bitmap_platform_device_win.h"
@@ skipping 106 matching lines @@
   }
   return hbitmap;
 }
 
 PlatformBitmapPixelRef::PlatformBitmapPixelRef(const SkImageInfo& info,
                                                HBITMAP bitmap_handle,
                                                void* pixels)
     : SkPixelRef(info),
       bitmap_handle_(bitmap_handle),
       pixels_(pixels) {
-  setPreLocked(pixels, NULL);
+  setPreLocked(pixels, info.minRowBytes(), NULL);
 }
 
 PlatformBitmapPixelRef::~PlatformBitmapPixelRef() {
   if (bitmap_handle_)
     DeleteObject(bitmap_handle_);
 }
 
 void* PlatformBitmapPixelRef::onLockPixels(SkColorTable** color_table) {
   *color_table = NULL;
   return pixels_;
@@ skipping 271 matching lines @@
   RefPtr<SkPixelRef> pixel_ref = AdoptRef(new PlatformBitmapPixelRef(info,
                                                                      hbitmap,
                                                                      data));
   bitmap_.setPixelRef(pixel_ref.get());
   bitmap_.lockPixels();
 
   return true;
 }
 
 }  // namespace skia