Fix OnChannelError() in StreamTextureHost

content/renderer/gpu/stream_texture_host_android.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/renderer/gpu/stream_texture_host_android.h"
 
 #include "base/unguessable_token.h"
 #include "content/renderer/render_thread_impl.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "gpu/ipc/common/gpu_messages.h"
 #include "ipc/ipc_message_macros.h"
 
 namespace content {
 
 StreamTextureHost::StreamTextureHost(scoped_refptr<gpu::GpuChannelHost> channel,
                                      int32_t route_id)
     : route_id_(route_id),
       listener_(NULL),

[watk, 2016/11/23 20:26:07]

nit: can you make this nullptr for consistency with below while you're at it.

[tguilbert, 2016/11/23 20:43:13]

Done.

       channel_(std::move(channel)),
       weak_ptr_factory_(this) {
   DCHECK(channel_);
+  DCHECK(route_id_);
 }
 
 StreamTextureHost::~StreamTextureHost() {
-  if (channel_.get() && route_id_)
-    channel_->RemoveRoute(route_id_);
+  if (!channel_.get())
+    return;
+
+  channel_->RemoveRoute(route_id_);
 }
 
 bool StreamTextureHost::BindToCurrentThread(Listener* listener) {
   listener_ = listener;
-  if (channel_.get() && route_id_) {
-    channel_->AddRoute(route_id_, weak_ptr_factory_.GetWeakPtr());
-    channel_->Send(new GpuStreamTextureMsg_StartListening(route_id_));
-    return true;
-  }
+  if (!channel_.get())

[watk, 2016/11/23 20:26:07]

All the if (!channel_.get())s can be replace with just if (!channel_)

[tguilbert, 2016/11/23 20:43:13]

Woops yes.

+    return false;
 
-  return false;
+  channel_->AddRoute(route_id_, weak_ptr_factory_.GetWeakPtr());
+  channel_->Send(new GpuStreamTextureMsg_StartListening(route_id_));
+
+  return true;
 }
 
 bool StreamTextureHost::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(StreamTextureHost, message)
-    IPC_MESSAGE_HANDLER(GpuStreamTextureMsg_FrameAvailable,
-                        OnFrameAvailable);
+    IPC_MESSAGE_HANDLER(GpuStreamTextureMsg_FrameAvailable, OnFrameAvailable);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled);
   return handled;
 }
 
 void StreamTextureHost::OnChannelError() {
+  channel_ = nullptr;
 }
 
 void StreamTextureHost::OnFrameAvailable() {
-  if (listener_)
-    listener_->OnFrameAvailable();
+  if (!listener_)
+    return;

[watk, 2016/11/23 20:26:07]

Re your question: think it's a personal preference thing whether you do this for
one-liners. I kinda like the old ones because they're shorter. But I'm fine with
this too.

[tguilbert, 2016/11/23 20:43:13]

Ok. I also preferred the old way. Changing it back.

+
+  listener_->OnFrameAvailable();
 }
 
 void StreamTextureHost::EstablishPeer(int player_id, int frame_id) {
-  if (route_id_) {
-    channel_->Send(
-        new GpuStreamTextureMsg_EstablishPeer(route_id_, frame_id, player_id));
-  }
+  if (!channel_.get())
+    return;
+
+  channel_->Send(
+      new GpuStreamTextureMsg_EstablishPeer(route_id_, frame_id, player_id));
 }
 
 void StreamTextureHost::SetStreamTextureSize(const gfx::Size& size) {
-  if (route_id_)
-    channel_->Send(new GpuStreamTextureMsg_SetSize(route_id_, size));
+  if (!channel_.get())
+    return;
+
+  channel_->Send(new GpuStreamTextureMsg_SetSize(route_id_, size));
 }
 
 void StreamTextureHost::ForwardStreamTextureForSurfaceRequest(
     const base::UnguessableToken& request_token) {
-  if (route_id_) {
-    channel_->Send(new GpuStreamTextureMsg_ForwardForSurfaceRequest(
-        route_id_, request_token));
-  }
+  if (!channel_.get())
+    return;
+
+  channel_->Send(new GpuStreamTextureMsg_ForwardForSurfaceRequest(
+      route_id_, request_token));
 }
 
 }  // namespace content