SkBitmap and SkPixelRef no longer need lock/unlock

content/browser/media/capture/cursor_renderer.cc

 // Copyright (c) 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 "content/browser/media/capture/cursor_renderer.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
@@ skipping 128 matching lines @@
     return;
 
   DCHECK(target);
 
   gfx::Rect rect = gfx::IntersectRects(
       gfx::Rect(scaled_cursor_bitmap_.width(), scaled_cursor_bitmap_.height()) +
           gfx::Vector2d(cursor_position_in_frame_.x(),
                         cursor_position_in_frame_.y()),
       target->visible_rect());
 
-  scaled_cursor_bitmap_.lockPixels();
   for (int y = rect.y(); y < rect.bottom(); ++y) {
     int cursor_y = y - cursor_position_in_frame_.y();
     uint8_t* yplane = target->data(media::VideoFrame::kYPlane) +
                       y * target->row_bytes(media::VideoFrame::kYPlane);
     uint8_t* uplane = target->data(media::VideoFrame::kUPlane) +
                       (y / 2) * target->row_bytes(media::VideoFrame::kUPlane);
     uint8_t* vplane = target->data(media::VideoFrame::kVPlane) +
                       (y / 2) * target->row_bytes(media::VideoFrame::kVPlane);
     for (int x = rect.x(); x < rect.right(); ++x) {
       int cursor_x = x - cursor_position_in_frame_.x();
@@ skipping 10 matching lines @@
       if ((x % 2 == 0) && (y % 2 == 0)) {
         int color_u = clip_byte(
             ((color_r * -38 + color_g * -74 + color_b * 112 + 128) >> 8) + 128);
         int color_v = clip_byte(
             ((color_r * 112 + color_g * -94 + color_b * -18 + 128) >> 8) + 128);
         uplane[x / 2] = alpha_blend(alpha, color_u, uplane[x / 2]);
         vplane[x / 2] = alpha_blend(alpha, color_v, vplane[x / 2]);
       }
     }
   }
-  scaled_cursor_bitmap_.unlockPixels();
 }
 
 void CursorRenderer::OnMouseMoved(const gfx::Point& location,
                                   base::TimeTicks timestamp) {
   if (!cursor_displayed_) {
     if (std::abs(location.x() - last_mouse_position_x_) > MIN_MOVEMENT_PIXELS ||
         std::abs(location.y() - last_mouse_position_y_) > MIN_MOVEMENT_PIXELS)
       cursor_displayed_ = true;
   }
 
   if (cursor_displayed_) {
     last_mouse_movement_timestamp_ = timestamp;
     last_mouse_position_x_ = location.x();
     last_mouse_position_y_ = location.y();
   }
 }
 
 void CursorRenderer::OnMouseClicked(const gfx::Point& location,
                                     base::TimeTicks timestamp) {
   cursor_displayed_ = true;
   last_mouse_movement_timestamp_ = timestamp;
   last_mouse_position_x_ = location.x();
   last_mouse_position_y_ = location.y();
 }
 
 }  // namespace content