SkBitmap and SkPixelRef no longer need lock/unlock

media/blink/webmediaplayer_cast_android.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 "media/blink/webmediaplayer_cast_android.h"
 
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "media/base/android/media_common_android.h"
@@ skipping 106 matching lines @@
     return nullptr;
   GLuint remote_playback_texture_id = 0;
   gl->GenTextures(1, &remote_playback_texture_id);
   GLuint texture_target = GL_TEXTURE_2D;
   gl->BindTexture(texture_target, remote_playback_texture_id);
   gl->TexParameteri(texture_target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   gl->TexParameteri(texture_target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   gl->TexParameteri(texture_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
   gl->TexParameteri(texture_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 
-  {
-    SkAutoLockPixels lock(bitmap);
-    gl->TexImage2D(texture_target, 0 /* level */, GL_RGBA /* internalformat */,
-                   bitmap.width(), bitmap.height(), 0 /* border */,
-                   GL_RGBA /* format */, GL_UNSIGNED_BYTE /* type */,
-                   bitmap.getPixels());
-  }
+  gl->TexImage2D(texture_target, 0 /* level */, GL_RGBA /* internalformat */,
+                 bitmap.width(), bitmap.height(), 0 /* border */,
+                 GL_RGBA /* format */, GL_UNSIGNED_BYTE /* type */,
+                 bitmap.getPixels());
 
   gpu::Mailbox texture_mailbox;
   gl->GenMailboxCHROMIUM(texture_mailbox.name);
   gl->ProduceTextureCHROMIUM(texture_target, texture_mailbox.name);
   const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM();
   gl->Flush();
 
   gpu::SyncToken texture_mailbox_sync_token;
   gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync,
                                      texture_mailbox_sync_token.GetData());
@@ skipping 221 matching lines @@
   return MakeTextFrameForCast(remote_playback_message_, canvas_size,
                               webmediaplayer_->NaturalSize(),
                               base::Bind(&GLCBShim, context_3d_cb_));
 }
 
 void WebMediaPlayerCast::setPoster(const blink::WebURL& poster) {
   player_manager_->SetPoster(player_id_, poster);
 }
 
 }  // namespace media