Remove shaped desktop support from remoting host and client.

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 <nacl_io/nacl_io.h>
 #include <sys/mount.h>
 
 #include <string>
@@ skipping 38 matching lines @@
 #include "remoting/client/plugin/pepper_port_allocator_factory.h"
 #include "remoting/client/plugin/pepper_url_request.h"
 #include "remoting/client/plugin/pepper_video_renderer_2d.h"
 #include "remoting/client/plugin/pepper_video_renderer_3d.h"
 #include "remoting/client/software_video_renderer.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/transport_context.h"
 #include "third_party/webrtc/base/helpers.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
 #include "url/gurl.h"
 
 namespace remoting {
 
 namespace {
 
 // Default DPI to assume for old clients that use notifyClientResolution.
 const int kDefaultDPI = 96;
 
 // Size of the random seed blob used to initialize RNG in libjingle. OpenSSL
@@ skipping 279 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", std::move(data));
 }
 
-void ChromotingInstance::OnVideoShape(const webrtc::DesktopRegion* shape) {
-  if ((shape && desktop_shape_ && shape->Equals(*desktop_shape_)) ||
-      (!shape && !desktop_shape_)) {
-    return;
-  }
-
-  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", std::move(shape_message));
-}
-
 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());
     rect_value->AppendInteger(rect.top());
     rect_value->AppendInteger(rect.width());
@@ skipping 744 matching lines @@
   if (is_custom_counts_histogram) {
     uma.HistogramCustomCounts(histogram_name, value, histogram_min,
                               histogram_max, histogram_buckets);
   } else {
     uma.HistogramCustomTimes(histogram_name, value, histogram_min,
                              histogram_max, histogram_buckets);
   }
 }
 
 }  // namespace remoting