Fix SetStreamTextureSize crash

content/renderer/media/android/stream_texture_wrapper_impl.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 "content/renderer/media/android/stream_texture_wrapper_impl.h"
 
 #include "base/callback.h"
 #include "cc/layers/video_frame_provider.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
@@ skipping 111 matching lines @@
 void StreamTextureWrapperImpl::UpdateTextureSize(const gfx::Size& new_size) {
   DVLOG(2) << __func__;
 
   if (!main_task_runner_->BelongsToCurrentThread()) {
     main_task_runner_->PostTask(
         FROM_HERE, base::Bind(&StreamTextureWrapperImpl::UpdateTextureSize,
                               weak_factory_.GetWeakPtr(), new_size));
     return;
   }
 
+  // InitializeOnMainThread() hasn't completed, or failed.

[watk, 2016/12/07 01:48:11]

nit: "hasn't completed" makes it sounds like it runs concurrently. Maybe
"InitializeOnMainThread() hasn't run or failed".

[tguilbert, 2016/12/07 19:23:55]

Done.

+  if (!stream_texture_proxy_)
+    return;
+
   if (natural_size_ == new_size)
     return;
 
   natural_size_ = new_size;
 
   ReallocateVideoFrame(new_size);
   stream_texture_proxy_->SetStreamTextureSize(new_size);
 }
 
 void StreamTextureWrapperImpl::Initialize(
     const base::Closure& received_frame_cb,
     const gfx::Size& natural_size,
     scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner,
-    const base::Closure& init_cb) {
+    const StreamTextureWrapperInitCB& init_cb) {
   DVLOG(2) << __func__;
 
   compositor_task_runner_ = compositor_task_runner;
   natural_size_ = natural_size;
 
   main_task_runner_->PostTask(
       FROM_HERE, base::Bind(&StreamTextureWrapperImpl::InitializeOnMainThread,
                             weak_factory_.GetWeakPtr(), received_frame_cb,
                             media::BindToCurrentLoop(init_cb)));
 }
 
 void StreamTextureWrapperImpl::InitializeOnMainThread(
     const base::Closure& received_frame_cb,
-    const base::Closure& init_cb) {
+    const StreamTextureWrapperInitCB& init_cb) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   DVLOG(2) << __func__;
 
   stream_texture_proxy_ = factory_->CreateProxy(
       kGLTextureExternalOES, &texture_id_, &texture_mailbox_);
-  if (!stream_texture_proxy_)
+  if (!stream_texture_proxy_) {
+    init_cb.Run(false);
     return;
+  }
 
   ReallocateVideoFrame(natural_size_);
 
   stream_texture_proxy_->BindToTaskRunner(received_frame_cb,
                                           compositor_task_runner_);
 
-  // TODO(tguilbert): Register the surface properly. See crbug.com/627658.
-
   // |init_cb| is bound to the thread that originally called Initialize().

[watk, 2016/12/07 01:48:11]

nit: comment feels out of place now that you're calling it above as well. Could
probably safely be deleted.

[tguilbert, 2016/12/07 19:23:55]

Done.

-  init_cb.Run();
+  init_cb.Run(true);
 }
 
 void StreamTextureWrapperImpl::Destroy() {
   // Note: StreamTextureProxy stop calling back the provided frame received
   // callback immediately, and delete itself on the right thread.
   stream_texture_proxy_.reset();
 
   if (!main_task_runner_->BelongsToCurrentThread()) {
     // base::Unretained is safe here because this function is the only one that
     // can can call delete.
     main_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&StreamTextureWrapperImpl::Destroy, base::Unretained(this)));
     return;
   }
 
   delete this;
 }
 
 }  // namespace content