| Index: remoting/client/plugin/chromoting_instance.cc
|
| diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
|
| index a7c56018ea132103e01d2d59867387b1acb8ea2e..af4954b0e21e2222466829793dae3e7e439319ee 100644
|
| --- a/remoting/client/plugin/chromoting_instance.cc
|
| +++ b/remoting/client/plugin/chromoting_instance.cc
|
| @@ -56,6 +56,7 @@
|
| #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 {
|
| @@ -355,31 +356,6 @@ void ChromotingInstance::OnVideoSize(const webrtc::DesktopSize& size,
|
| 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());
|
|
|