Fold BeginFrameSource::SetClientReady into AddObserver

content/renderer/gpu/compositor_external_begin_frame_source.cc

 // Copyright 2014 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/compositor_external_begin_frame_source.h"
 
 #include "content/common/view_messages.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message_filter.h"
 
@@ skipping 25 matching lines @@
     bool needs_begin_frames) {
   DCHECK(CalledOnValidThread());
   if (!needs_begin_frames)
     missed_begin_frame_args_ = cc::BeginFrameArgs();
   Send(new ViewHostMsg_SetNeedsBeginFrames(routing_id_, needs_begin_frames));
 }
 
 void CompositorExternalBeginFrameSource::AddObserver(
     cc::BeginFrameObserver* obs) {
   DCHECK(CalledOnValidThread());
+  SetClientReady();
   BeginFrameSourceBase::AddObserver(obs);
   // Send a MISSED begin frame if necessary.
   if (missed_begin_frame_args_.IsValid()) {
     cc::BeginFrameArgs last_args = obs->LastUsedBeginFrameArgs();
     if (!last_args.IsValid() ||
         (missed_begin_frame_args_.frame_time > last_args.frame_time)) {
       obs->OnBeginFrame(missed_begin_frame_args_);
     }
   }
 }
 
 void CompositorExternalBeginFrameSource::SetClientReady() {
   DCHECK(CalledOnValidThread());
-  DCHECK(!begin_frame_source_proxy_.get());
+  if (begin_frame_source_proxy_)
+    return;
   begin_frame_source_proxy_ =
       new CompositorExternalBeginFrameSourceProxy(this);
   begin_frame_source_filter_handler_ = base::Bind(
       &CompositorExternalBeginFrameSourceProxy::OnMessageReceived,
       begin_frame_source_proxy_);
   begin_frame_source_filter_->AddHandlerOnCompositorThread(
       routing_id_,
       begin_frame_source_filter_handler_);
 }
 
@@ skipping 12 matching lines @@
   missed_begin_frame_args_ = args;
   missed_begin_frame_args_.type = cc::BeginFrameArgs::MISSED;
   CallOnBeginFrame(args);
 }
 
 bool CompositorExternalBeginFrameSource::Send(IPC::Message* message) {
   return message_sender_->Send(message);
 }
 
 }  // namespace content