Allow shaped-desktop hosts to send shape only when it changes.

remoting/client/jni/chromoting_jni_instance.cc

 // Copyright 2013 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 "remoting/client/jni/chromoting_jni_instance.h"
 
 #include <android/log.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 369 matching lines @@
 
   jni_runtime_->UpdateCursorShape(shape);
 }
 
 void ChromotingJniInstance::ConnectToHostOnDisplayThread() {
   DCHECK(jni_runtime_->display_task_runner()->BelongsToCurrentThread());
 
   view_.reset(new JniFrameConsumer(jni_runtime_, this));
   view_weak_factory_.reset(new base::WeakPtrFactory<JniFrameConsumer>(
       view_.get()));
-  frame_consumer_ = new FrameConsumerProxy(jni_runtime_->display_task_runner(),
-                                           view_weak_factory_->GetWeakPtr());
+  scoped_ptr<FrameConsumerProxy> frame_consumer =
+      make_scoped_ptr(new FrameConsumerProxy(view_weak_factory_->GetWeakPtr()));
 
   jni_runtime_->network_task_runner()->PostTask(
       FROM_HERE,
-      base::Bind(&ChromotingJniInstance::ConnectToHostOnNetworkThread,
-                 this));
+      base::Bind(&ChromotingJniInstance::ConnectToHostOnNetworkThread, this,
+                 base::Passed(&frame_consumer)));
 }
 
-void ChromotingJniInstance::ConnectToHostOnNetworkThread() {
+void ChromotingJniInstance::ConnectToHostOnNetworkThread(
+    scoped_ptr<FrameConsumerProxy> frame_consumer) {
   DCHECK(jni_runtime_->network_task_runner()->BelongsToCurrentThread());
+  DCHECK(frame_consumer);
 
   jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
 
-  client_context_.reset(new ClientContext(
-      jni_runtime_->network_task_runner().get()));
+  client_context_.reset(new ClientContext(jni_runtime_->network_task_runner()));
   client_context_->Start();
 
-  SoftwareVideoRenderer* renderer =
-      new SoftwareVideoRenderer(client_context_->main_task_runner(),
-                                client_context_->decode_task_runner(),
-                                frame_consumer_);
+  SoftwareVideoRenderer* renderer = new SoftwareVideoRenderer(
+      client_context_->main_task_runner(),
+      client_context_->decode_task_runner(), frame_consumer.Pass());
   view_->set_frame_producer(renderer);
   video_renderer_.reset(renderer);
 
   client_.reset(new ChromotingClient(
       client_context_.get(), this, video_renderer_.get(), nullptr));
 
   signaling_.reset(new XmppSignalStrategy(
       net::ClientSocketFactory::GetDefaultFactory(),
       jni_runtime_->url_requester(), xmpp_config_));
 
@@ skipping 109 matching lines @@
                       stats->round_trip_ms()->Average());
 
   client_status_logger_->LogStatistics(stats);
 
   jni_runtime_->network_task_runner()->PostDelayedTask(
       FROM_HERE, base::Bind(&ChromotingJniInstance::LogPerfStats, this),
       base::TimeDelta::FromMilliseconds(kPerfStatsIntervalMs));
 }
 
 }  // namespace remoting