SkBitmap and SkPixelRef no longer need lock/unlock

remoting/test/frame_generator_util.cc

 // Copyright 2016 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 "remoting/test/frame_generator_util.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace {
 // dst_stride is int, not size_t, as it may be negative for inverted (in Y)
 // images.
 void CopyPixelsToBuffer(const SkBitmap& src,
                         uint8_t* dst_pixels,
                         int dst_stride) {
-  SkBitmap tmp(src);
-  tmp.lockPixels();
-  const char* src_pixels = static_cast<const char*>(tmp.getPixels());
-  size_t src_stride = tmp.rowBytes();
+  const char* src_pixels = static_cast<const char*>(src.getPixels());
+  size_t src_stride = src.rowBytes();
   // Only need to copy the important parts of the row.
-  size_t bytes_per_row = tmp.width() * tmp.bytesPerPixel();
-  for (int y = 0; y < tmp.height(); ++y) {
+  size_t bytes_per_row = src.width() * src.bytesPerPixel();
+  for (int y = 0; y < src.height(); ++y) {
     memcpy(dst_pixels, src_pixels, bytes_per_row);
     src_pixels += src_stride;
     dst_pixels += dst_stride;
   }
 }
 }  // namespace
 
 namespace remoting {
 namespace test {
 
@@ skipping 26 matching lines @@
     uint32_t* data = reinterpret_cast<uint32_t*>(
         frame->GetFrameDataAtPos(webrtc::DesktopVector(rect.left(), y)));
     for (int x = 0; x < rect.width(); ++x) {
       data[x] = color;
     }
   }
 }
 
 }  // namespace test
 }  // namespace remoting