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

remoting/client/plugin/chromoting_instance.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 "remoting/client/plugin/chromoting_instance.h"
 
 #include <string>
 #include <vector>
 
 #if defined(OS_NACL)
@@ skipping 420 matching lines @@
   scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
   data->SetInteger("width", size.width());
   data->SetInteger("height", size.height());
   if (dpi.x())
     data->SetInteger("x_dpi", dpi.x());
   if (dpi.y())
     data->SetInteger("y_dpi", dpi.y());
   PostLegacyJsonMessage("onDesktopSize", data.Pass());
 }
 
-void ChromotingInstance::OnVideoShape(const webrtc::DesktopRegion& shape) {
-  if (desktop_shape_ && shape.Equals(*desktop_shape_))
+void ChromotingInstance::OnVideoShape(const webrtc::DesktopRegion* shape) {
+  if ((shape && desktop_shape_ && shape->Equals(*desktop_shape_)) ||
+      (!shape && !desktop_shape_)) {
     return;
-
-  desktop_shape_.reset(new webrtc::DesktopRegion(shape));
-
-  scoped_ptr<base::ListValue> rects_value(new base::ListValue());
-  for (webrtc::DesktopRegion::Iterator i(shape); !i.IsAtEnd(); i.Advance()) {
-    const webrtc::DesktopRect& rect = i.rect();
-    scoped_ptr<base::ListValue> rect_value(new base::ListValue());
-    rect_value->AppendInteger(rect.left());
-    rect_value->AppendInteger(rect.top());
-    rect_value->AppendInteger(rect.width());
-    rect_value->AppendInteger(rect.height());
-    rects_value->Append(rect_value.release());
   }
 
-  scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
-  data->Set("rects", rects_value.release());
-  PostLegacyJsonMessage("onDesktopShape", data.Pass());
+  scoped_ptr<base::DictionaryValue> shape_message(new base::DictionaryValue());
+  if (shape) {
+    desktop_shape_ = make_scoped_ptr(new webrtc::DesktopRegion(*shape));
+    scoped_ptr<base::ListValue> rects_value(new base::ListValue());
+    for (webrtc::DesktopRegion::Iterator i(*shape); !i.IsAtEnd(); i.Advance()) {
+      const webrtc::DesktopRect& rect = i.rect();
+      scoped_ptr<base::ListValue> rect_value(new base::ListValue());
+      rect_value->AppendInteger(rect.left());
+      rect_value->AppendInteger(rect.top());
+      rect_value->AppendInteger(rect.width());
+      rect_value->AppendInteger(rect.height());
+      rects_value->Append(rect_value.release());
+    }
+    shape_message->Set("rects", rects_value.release());
+  }
+
+  PostLegacyJsonMessage("onDesktopShape", shape_message.Pass());
 }
 
 void ChromotingInstance::OnVideoFrameDirtyRegion(
     const webrtc::DesktopRegion& dirty_region) {
   scoped_ptr<base::ListValue> rects_value(new base::ListValue());
   for (webrtc::DesktopRegion::Iterator i(dirty_region); !i.IsAtEnd();
        i.Advance()) {
     const webrtc::DesktopRect& rect = i.rect();
     scoped_ptr<base::ListValue> rect_value(new base::ListValue());
     rect_value->AppendInteger(rect.left());
@@ skipping 758 matching lines @@
 
 #if !defined(OS_NACL)
   // Log messages are forwarded to the webapp only in PNaCl version of the
   // plugin, so ProcessLogToUI() needs to be called explicitly in the non-PNaCl
   // version.
   ProcessLogToUI(message);
 #endif  // !defined(OS_NACL)
 }
 
 }  // namespace remoting