Merge to M51: Various fixes to prevent playback hang on MotoX.

content/common/gpu/media/gpu_video_decode_accelerator.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 "content/common/gpu/media/gpu_video_decode_accelerator.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 450 matching lines @@
                                         width, height, 1, 0, format, 0,
                                         gfx::Rect());
         }
       }
       service_ids.push_back(texture_ref->service_id());
       textures.push_back(texture_ref);
     }
     buffers.push_back(media::PictureBuffer(buffer_ids[i], texture_dimensions_,
                                            service_ids, buffer_texture_ids));
   }
+  {
+    DebugAutoLock auto_lock(debug_uncleared_textures_lock_);
+    for (uint32_t i = 0; i < buffer_ids.size(); ++i)
+      uncleared_textures_[buffer_ids[i]] = textures[i];
+  }
   video_decode_accelerator_->AssignPictureBuffers(buffers);
-  DebugAutoLock auto_lock(debug_uncleared_textures_lock_);
-  for (uint32_t i = 0; i < buffer_ids.size(); ++i)
-    uncleared_textures_[buffer_ids[i]] = textures[i];
 }
 
 void GpuVideoDecodeAccelerator::OnReusePictureBuffer(
     int32_t picture_buffer_id) {
   DCHECK(video_decode_accelerator_);
   video_decode_accelerator_->ReusePictureBuffer(picture_buffer_id);
 }
 
 void GpuVideoDecodeAccelerator::OnFlush() {
   DCHECK(video_decode_accelerator_);
@@ skipping 28 matching lines @@
   scoped_refptr<gpu::gles2::TextureRef> texture_ref = it->second;
   GLenum target = texture_ref->texture()->target();
   gpu::gles2::TextureManager* texture_manager =
       stub_->decoder()->GetContextGroup()->texture_manager();
   DCHECK(!texture_ref->texture()->IsLevelCleared(target, 0));
   texture_manager->SetLevelCleared(texture_ref.get(), target, 0, true);
   uncleared_textures_.erase(it);
 }
 
 }  // namespace content